diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/src/main.ts b/src/main.ts index 07904e8..abdb320 100644 --- a/src/main.ts +++ b/src/main.ts @@ -41,6 +41,8 @@ console.log(result) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data + app.config.globalProperties.$pathDict = result.data.pathDict + window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/src/main.ts b/src/main.ts index 07904e8..abdb320 100644 --- a/src/main.ts +++ b/src/main.ts @@ -41,6 +41,8 @@ console.log(result) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data + app.config.globalProperties.$pathDict = result.data.pathDict + window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue deleted file mode 100644 index 14fbdf4..0000000 --- a/src/views/tested/dashboard/components/BarChartHorizontal.vue +++ /dev/null @@ -1,361 +0,0 @@ - - - - - diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/src/main.ts b/src/main.ts index 07904e8..abdb320 100644 --- a/src/main.ts +++ b/src/main.ts @@ -41,6 +41,8 @@ console.log(result) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data + app.config.globalProperties.$pathDict = result.data.pathDict + window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue deleted file mode 100644 index 14fbdf4..0000000 --- a/src/views/tested/dashboard/components/BarChartHorizontal.vue +++ /dev/null @@ -1,361 +0,0 @@ - - - - - diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue new file mode 100644 index 0000000..6db0dee --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/src/main.ts b/src/main.ts index 07904e8..abdb320 100644 --- a/src/main.ts +++ b/src/main.ts @@ -41,6 +41,8 @@ console.log(result) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data + app.config.globalProperties.$pathDict = result.data.pathDict + window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue deleted file mode 100644 index 14fbdf4..0000000 --- a/src/views/tested/dashboard/components/BarChartHorizontal.vue +++ /dev/null @@ -1,361 +0,0 @@ - - - - - diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue new file mode 100644 index 0000000..6db0dee --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue new file mode 100644 index 0000000..86fe7ae --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/src/main.ts b/src/main.ts index 07904e8..abdb320 100644 --- a/src/main.ts +++ b/src/main.ts @@ -41,6 +41,8 @@ console.log(result) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data + app.config.globalProperties.$pathDict = result.data.pathDict + window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue deleted file mode 100644 index 14fbdf4..0000000 --- a/src/views/tested/dashboard/components/BarChartHorizontal.vue +++ /dev/null @@ -1,361 +0,0 @@ - - - - - diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue new file mode 100644 index 0000000..6db0dee --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue new file mode 100644 index 0000000..86fe7ae --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/views/tested/dashboard/components/index1.vue b/src/views/tested/dashboard/components/index1.vue new file mode 100644 index 0000000..10362ba --- /dev/null +++ b/src/views/tested/dashboard/components/index1.vue @@ -0,0 +1,39 @@ + + + + + + diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/src/main.ts b/src/main.ts index 07904e8..abdb320 100644 --- a/src/main.ts +++ b/src/main.ts @@ -41,6 +41,8 @@ console.log(result) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data + app.config.globalProperties.$pathDict = result.data.pathDict + window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue deleted file mode 100644 index 14fbdf4..0000000 --- a/src/views/tested/dashboard/components/BarChartHorizontal.vue +++ /dev/null @@ -1,361 +0,0 @@ - - - - - diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue new file mode 100644 index 0000000..6db0dee --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue new file mode 100644 index 0000000..86fe7ae --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/views/tested/dashboard/components/index1.vue b/src/views/tested/dashboard/components/index1.vue new file mode 100644 index 0000000..10362ba --- /dev/null +++ b/src/views/tested/dashboard/components/index1.vue @@ -0,0 +1,39 @@ + + + + + + diff --git a/src/views/tested/dashboard/components/listApprove.vue b/src/views/tested/dashboard/components/listApprove.vue index c66f4db..10a6698 100644 --- a/src/views/tested/dashboard/components/listApprove.vue +++ b/src/views/tested/dashboard/components/listApprove.vue @@ -1,10 +1,13 @@ @@ -151,7 +161,7 @@ diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/src/main.ts b/src/main.ts index 07904e8..abdb320 100644 --- a/src/main.ts +++ b/src/main.ts @@ -41,6 +41,8 @@ console.log(result) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data + app.config.globalProperties.$pathDict = result.data.pathDict + window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue deleted file mode 100644 index 14fbdf4..0000000 --- a/src/views/tested/dashboard/components/BarChartHorizontal.vue +++ /dev/null @@ -1,361 +0,0 @@ - - - - - diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue new file mode 100644 index 0000000..6db0dee --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue new file mode 100644 index 0000000..86fe7ae --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/views/tested/dashboard/components/index1.vue b/src/views/tested/dashboard/components/index1.vue new file mode 100644 index 0000000..10362ba --- /dev/null +++ b/src/views/tested/dashboard/components/index1.vue @@ -0,0 +1,39 @@ + + + + + + diff --git a/src/views/tested/dashboard/components/listApprove.vue b/src/views/tested/dashboard/components/listApprove.vue index c66f4db..10a6698 100644 --- a/src/views/tested/dashboard/components/listApprove.vue +++ b/src/views/tested/dashboard/components/listApprove.vue @@ -1,10 +1,13 @@ @@ -151,7 +161,7 @@ diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue index 1e9d7ba..cd3a018 100644 --- a/src/views/tested/dashboard/index.vue +++ b/src/views/tested/dashboard/index.vue @@ -7,8 +7,10 @@ import tableList from './components/tableList.vue' import BarChartVerticalCom from './components/BarChartVertical.vue' import BarChartHorizontalCom from './components/BarChartHorizontalCom.vue' +import BarChartVerticalCustom from './components/BarChartHorizontalCustom.vue' +import BarChartVerticalCircle from './components/BarChartVerticalCircle.vue' // import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar' -import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend } from '@/api/eqpt/dashboard/index' +import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend, inCheckInfo, inUseInfo, toCheckInfo } from '@/api/eqpt/dashboard/index' import { getUserDept } from '@/api/system/user' import useUserStore from '@/store/modules/user' const height = ref(document.body.clientHeight - 50 - 60 - 10) @@ -307,7 +309,35 @@ }, 100) // 滚动速度 } } - +// 设备态势分析-在用 +const inCheckStatisticData = ref() +// 获取设备状态数据 +const fecthDeviceStatus = (id: string) => { + // 在检设备 + inCheckInfo({ deptIds: id }).then((res) => { + console.log(res.data, '在检设备') + const data = res.data + inCheckStatisticData.value = res.data.statistic.map((item: any) => ({ name: item.name, value: item.count })) + }) + // 待检设备 + toCheckInfo({ deptIds: id }).then((res) => { + console.log(res.data, '待检设备') + }) + // 再用设备 + inUseInfo({ deptIds: id }).then((res) => { + console.log(res.data, '再用设备') + }) +} +fecthDeviceStatus(user.deptId) +// 设备状态搜索 +const searchDeviceStatus = () => { + if (Devicedept.value) { + fecthDeviceStatus(tableDept.value) + } + else { + fecthDeviceStatus(user.deptId) + } +} // ------------------------------------------------------------------------------------ onMounted(async () => { const user = await getUserDept() @@ -484,14 +514,14 @@
- +
- + + +
diff --git a/public/config/config.json b/public/config/config.json index 3bd0a89..c1fab5e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,17 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:21611" + "baseUrl": "http://111.198.10.15:21611", + "pathDict": { + "通知公告":"/noticelist/list", + "fbfpsbgl":"/reviewpage/detail", + "fbfmlgl":"/directorypage/detail", + "sbyysq":"/sdelaypage/detail", + "jljhgl":"/plan/detail", + "tqsjsq":"/ealy/detail", + "ycsjsq":"/delay/detail", + "sbjysq":"/disablepage/detail", + "sbtzgl":"/info/detail", + "sbqfsq":"/unsealpage/detail", + "sbbfsq":"/scrappage/detail" + } } diff --git a/src/api/eqpt/dashboard/index.ts b/src/api/eqpt/dashboard/index.ts index fcf88a1..f9233d1 100644 --- a/src/api/eqpt/dashboard/index.ts +++ b/src/api/eqpt/dashboard/index.ts @@ -91,3 +91,27 @@ }) } } +// 在用设备信息 +export function inUseInfo(params: object) { + return request({ + url: '/board/equipment/inUseInfo', + method: 'get', + params, + }) +} +// 在检设备 +export function inCheckInfo(params: object) { + return request({ + url: '/board/equipment/inCheckInfo', + method: 'get', + params, + }) +} +// 待检设备 +export function toCheckInfo(params: object) { + return request({ + url: '/board/equipment/toCheckInfo', + method: 'get', + params, + }) +} diff --git a/src/main.ts b/src/main.ts index 07904e8..abdb320 100644 --- a/src/main.ts +++ b/src/main.ts @@ -41,6 +41,8 @@ console.log(result) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data + app.config.globalProperties.$pathDict = result.data.pathDict + window.$pathDict = result.data.pathDict window.localStorage.setItem('baseURL', result.data.baseUrl) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) app.mount('#app') diff --git a/src/views/tested/dashboard/components/BarChartHorizontal.vue b/src/views/tested/dashboard/components/BarChartHorizontal.vue deleted file mode 100644 index 14fbdf4..0000000 --- a/src/views/tested/dashboard/components/BarChartHorizontal.vue +++ /dev/null @@ -1,361 +0,0 @@ - - - - - diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue new file mode 100644 index 0000000..6db0dee --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue new file mode 100644 index 0000000..86fe7ae --- /dev/null +++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/views/tested/dashboard/components/index1.vue b/src/views/tested/dashboard/components/index1.vue new file mode 100644 index 0000000..10362ba --- /dev/null +++ b/src/views/tested/dashboard/components/index1.vue @@ -0,0 +1,39 @@ + + + + + + diff --git a/src/views/tested/dashboard/components/listApprove.vue b/src/views/tested/dashboard/components/listApprove.vue index c66f4db..10a6698 100644 --- a/src/views/tested/dashboard/components/listApprove.vue +++ b/src/views/tested/dashboard/components/listApprove.vue @@ -1,10 +1,13 @@ @@ -151,7 +161,7 @@ diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue index 1e9d7ba..cd3a018 100644 --- a/src/views/tested/dashboard/index.vue +++ b/src/views/tested/dashboard/index.vue @@ -7,8 +7,10 @@ import tableList from './components/tableList.vue' import BarChartVerticalCom from './components/BarChartVertical.vue' import BarChartHorizontalCom from './components/BarChartHorizontalCom.vue' +import BarChartVerticalCustom from './components/BarChartHorizontalCustom.vue' +import BarChartVerticalCircle from './components/BarChartVerticalCircle.vue' // import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar' -import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend } from '@/api/eqpt/dashboard/index' +import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend, inCheckInfo, inUseInfo, toCheckInfo } from '@/api/eqpt/dashboard/index' import { getUserDept } from '@/api/system/user' import useUserStore from '@/store/modules/user' const height = ref(document.body.clientHeight - 50 - 60 - 10) @@ -307,7 +309,35 @@ }, 100) // 滚动速度 } } - +// 设备态势分析-在用 +const inCheckStatisticData = ref() +// 获取设备状态数据 +const fecthDeviceStatus = (id: string) => { + // 在检设备 + inCheckInfo({ deptIds: id }).then((res) => { + console.log(res.data, '在检设备') + const data = res.data + inCheckStatisticData.value = res.data.statistic.map((item: any) => ({ name: item.name, value: item.count })) + }) + // 待检设备 + toCheckInfo({ deptIds: id }).then((res) => { + console.log(res.data, '待检设备') + }) + // 再用设备 + inUseInfo({ deptIds: id }).then((res) => { + console.log(res.data, '再用设备') + }) +} +fecthDeviceStatus(user.deptId) +// 设备状态搜索 +const searchDeviceStatus = () => { + if (Devicedept.value) { + fecthDeviceStatus(tableDept.value) + } + else { + fecthDeviceStatus(user.deptId) + } +} // ------------------------------------------------------------------------------------ onMounted(async () => { const user = await getUserDept() @@ -484,14 +514,14 @@
- +
- + + +
diff --git a/src/views/tested/dashboard/index1.vue b/src/views/tested/dashboard/index1.vue deleted file mode 100644 index 10362ba..0000000 --- a/src/views/tested/dashboard/index1.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - - - -