diff --git a/src/api/system/servicePackage.js b/src/api/system/servicePackage.js index bf4c34c..231335a 100644 --- a/src/api/system/servicePackage.js +++ b/src/api/system/servicePackage.js @@ -46,7 +46,7 @@ export function getServicePackagePage(query) { // 获取服务套餐精简信息列表 export function getServicePackageList() { return request({ - url: '/system/service-package/get-simple-list', + url: '/system/service-package/getPackageListByTenantId', method: 'get' }) } diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue index df30e47..f138230 100644 --- a/src/components/ImagePreview/index.vue +++ b/src/components/ImagePreview/index.vue @@ -39,7 +39,7 @@ export default { if (isExternal(real_src)) { return real_src; } - + console.log(process.env.VUE_APP_IMAGE_URL + real_src,42) return process.env.VUE_APP_IMAGE_URL + real_src; }, realSrcList() { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index bbc1d36..2aafa80 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -106,7 +106,7 @@ export default { async logout() { this.$modal.confirm('确定注销并退出系统吗?', '提示').then(() => { this.$store.dispatch('LogOut').then(() => { - location.href = getPath('/index'); + window.location.href = "http://159.75.168.143:82/yudao-admin/login"; }) }).catch(() => {}); } diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index fd5d109..5c7eafd 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -228,6 +228,7 @@ export function getBasePath() { export function getPath(path) { // 基础路径,必须以 / 结尾 let basePath = getBasePath(); + console.log(basePath,"basePath") if (!basePath.endsWith('/')) { return basePath + '/'; } diff --git a/src/views/index.vue b/src/views/index.vue index d2d2ec6..0569304 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,31 +1,36 @@ @@ -35,6 +40,7 @@ import LineChart from './dashboard/LineChart' import RaddarChart from './dashboard/RaddarChart' import PieChart from './dashboard/PieChart' import BarChart from './dashboard/BarChart' +import {getServicePackageList} from "@/api/system/servicePackage"; const lineChartData = { newVisitis: { @@ -66,12 +72,29 @@ export default { }, data() { return { - lineChartData: lineChartData.newVisitis + lineChartData: lineChartData.newVisitis, + serviceList:[], + warnList:[], + messageList:[], + queryParams:{ + pageNo:1, + pageSize:10 + } } }, + created() { + this.getServiceList() + }, methods: { handleSetLineChartData(type) { this.lineChartData = lineChartData[type] + }, + getServiceList(){ + getServicePackageList(this.queryParams).then(response => { + this.serviceList = response.data; + + }); + } } } diff --git a/src/views/repair/screen/repairBigScreen.vue b/src/views/repair/screen/repairBigScreen.vue index c30b767..a389b07 100644 --- a/src/views/repair/screen/repairBigScreen.vue +++ b/src/views/repair/screen/repairBigScreen.vue @@ -1,14 +1,14 @@