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/base/customer/CustomerMainForm.vue b/src/views/base/customer/CustomerMainForm.vue index c52e6cc..36a5464 100644 --- a/src/views/base/customer/CustomerMainForm.vue +++ b/src/views/base/customer/CustomerMainForm.vue @@ -247,7 +247,10 @@ export default { // 表单校验 formRules: { cusName: [ - { required: true, message: '请输入活动名称', trigger: 'blur' }, + { required: true, message: '请输入客户名称', trigger: 'blur' }, + ], + sex:[ + { required: true, message: '请选择客户性别', trigger: 'blur' }, ], typeCode: [ { required: true, message: '请选择客户类型', trigger: 'change' }, @@ -261,9 +264,6 @@ export default { inviterType: [ { required: true, message: '请选择注册方式', trigger: 'change' }, ], - memberLevelId:[ - { required: true, message: '请选择会员', trigger: 'change' }, - ], }, // 性别数据字典 sexDictDatas: getDictDatas(DICT_TYPE.DICT_SYS_USER_SEX), diff --git a/src/views/index.vue b/src/views/index.vue index d2d2ec6..21d0e3e 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,31 +1,81 @@ @@ -35,6 +85,8 @@ 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"; +import {getMyNotifyMessagePage, getUnreadNotifyMessageList} from "@/api/system/notify/message"; const lineChartData = { newVisitis: { @@ -66,12 +118,42 @@ export default { }, data() { return { - lineChartData: lineChartData.newVisitis + lineChartData: lineChartData.newVisitis, + serviceList: [], + warnList: [], + messageList: [], + queryParams: { + pageNo: 1, + pageSize: 10 + }, + messageQueryParams: { + pageNo: 1, + pageSize: 10 + }, + messageTotal: 0 } }, + created() { + this.getServiceList() + this.getNotifyMessage() + }, methods: { handleSetLineChartData(type) { this.lineChartData = lineChartData[type] + }, + getNotifyMessage() { + // 执行查询 + getMyNotifyMessagePage(this.messageQueryParams).then(response => { + this.messageList = response.data.list; + this.messageTotal = response.data.total; + }); + }, + getServiceList() { + getServicePackageList(this.queryParams).then(response => { + this.serviceList = response.data; + + }); + } } } @@ -90,7 +172,7 @@ export default { } } -@media (max-width:1024px) { +@media (max-width: 1024px) { .chart-wrapper { padding: 8px; } 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 @@