From 944f2113c846264e9fe65831adc72cd5072890a4 Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Thu, 15 Jul 2021 17:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86=E5=86=B2?= =?UTF-8?q?=E7=AA=81=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81=EF=BC=8C?= =?UTF-8?q?host=E7=BB=9F=E4=B8=80=EF=BC=8C=E8=AF=BE=E7=A8=8B=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BB=B6=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/main.css | 5 + src/components/Sidebar.vue | 10 +- src/utils/api.js | 69 ++++++------- src/utils/core.js | 6 +- src/views/course/AddCurriculum.vue | 97 ++++++++++++------ src/views/course/Curriculum.vue | 41 ++++---- src/views/course/assetConfig.vue | 158 +++++++++++++++-------------- src/views/course/courseconfig.vue | 150 ++++++++++++++++++++------- src/views/order/AddOrder.vue | 37 +++++-- src/views/order/Order.vue | 17 +++- src/views/order/selectClient.vue | 15 +-- 11 files changed, 380 insertions(+), 225 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index ee9eb26..a453206 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -247,6 +247,11 @@ li { display: flex; align-items: center; } +.flex-c-c{ + display: flex; + align-items: center; + justify-content: center; +} .flex-between{ display: flex; align-items: center; diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index c6aa132..42a6367 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -70,11 +70,11 @@ export default { index: 'order', title: '订单管理' }, - { - icon: 'el-icon-lx-emoji', - index: 'configure', - title: '服务配置' - }, + // { + // icon: 'el-icon-lx-emoji', + // index: 'configure', + // title: '服务配置' + // }, { icon: 'el-icon-lx-emoji', index: 'curriculum', diff --git a/src/utils/api.js b/src/utils/api.js index c9c0eae..cf684c1 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -39,20 +39,21 @@ export default { queryPlatform: `${host}/liuwanr/userInfo/queryPlatform`, // 用户管理 - delUserAccounts: `${host3}/users/users/userAccount/delUserAccounts`, - queryUserInfoDetails: `${host3}/users/userAccount/queryUserInfoDetails`, - queryUserInfoList: `${host3}/users/users/userAccount/queryUserInfoList`, - resetPwd: `${host3}/users/users/userAccount/resetPwd`, - selectAccountDetail: `${host3}/users/users/userAccount/selectAccountDetail`, - selectUserSysBind: `${host3}/users/users/userAccount/selectUserSysBind`, - updatePersonCenter: `${host3}/users/users/userAccount/updatePersonCenter`, - updateUserAvatars: `${host2}/users/users/userAccount/updateUserAvatars`, - userInfo: `${host3}/users/users/userAccount/userInfo`, - bindPhoneOrEmail: `${host3}/users/users/userAccount/bindPhoneOrEmail`, - sendPhoneOrEmailCode: `${host3}/users/users/userAccount/sendPhoneOrEmailCode`, - updateAccountEnable: `${host3}/users/users/userAccount/updateAccountEnable`, - updateAccountAllEnable: `${host3}/users/users/userAccount/updateAccountAllEnable`, - examinePassword: `${host3}/users/users/userAccount/examinePassword`, + delUserAccounts: `${host}/users/users/userAccount/delUserAccounts`, + queryUserInfoDetails: `${host}/users/users/userAccount/queryUserInfoDetails`, + + queryUserInfoList: `${host}/users/users/userAccount/queryUserInfoList`, + resetPwd: `${host}/users/users/userAccount/resetPwd`, + selectAccountDetail: `${host}/users/users/userAccount/selectAccountDetail`, + selectUserSysBind: `${host}/users/users/userAccount/selectUserSysBind`, + updatePersonCenter: `${host}/users/users/userAccount/updatePersonCenter`, + updateUserAvatars: `${host}/users/users/userAccount/updateUserAvatars`, + userInfo: `${host}/users/u3sers/userAccount/userInfo`, + bindPhoneOrEmail: `${host}/users/users/userAccount/bindPhoneOrEmail`, + sendPhoneOrEmailCode: `${host}/users/users/userAccount/sendPhoneOrEmailCode`, + updateAccountEnable: `${host}/users/users/userAccount/updateAccountEnable`, + updateAccountAllEnable: `${host}/users/users/userAccount/updateAccountAllEnable`, + examinePassword: `${host}/users/users/userAccount/examinePassword`, queryOrder: `${host}/liuwanr/order/queryOrder`, //查询订单 queryOrderDetails: `${host}/liuwanr/order/queryOrderDetails`, //查询订单详情 @@ -85,9 +86,9 @@ export default { queryProvince: `${host}/nakadai/nakadai/province/queryProvince`, //查询省份 queryCity: `${host}/nakadai/nakadai/city/queryCity`, //查询城市 - queryCourseDiscipline: `${host3}/nakadai/nakadai/discipline/queryDiscipline`, //查询课程学科 - queryCourseProfessionalClass: `${host3}/nakadai/nakadai/professionalClass/queryProfessionalClass`, //查询专业类 - queryCourseProfessional: `${host3}/nakadai/nakadai/professional/queryProfessional`, //查询专业 + queryCourseDiscipline: `${host}/nakadai/nakadai/discipline/queryDiscipline`, //查询课程学科 + queryCourseProfessionalClass: `${host}/nakadai/nakadai/professionalClass/queryProfessionalClass`, //查询专业类 + queryCourseProfessional: `${host}/nakadai/nakadai/professional/queryProfessional`, //查询专业 queryAppConfig: `${host}/liuwanr/course/queryAppConfig`, //查询应用配置 queryTrainingConfig: `${host}/liuwanr/course/queryConfig`, //查询实训配置 deleteTrainingConfig: `${host}/liuwanr/course/deleteTrainingConfig`, //删除实训配置 @@ -102,24 +103,24 @@ export default { downloadFiles: `${host}/liuwanr/aliyun/downloadFiles`, //下载文件 // 数据管理 - getIdQueryTable:`${host1}/data/data/table/getIdQueryTable`, + getIdQueryTable:`${host}/data/data/table/getIdQueryTable`, - getTableByClassification:`${host1}/data/data/table/getTableByClassification`, - getTableByCondition:`${host1}/data/data/table/getTableByCondition`, - originalList:`${host1}/data/data/table/originalList`, - originalListById:`${host1}/data/data/table/originalListById`, - saveCategory:`${host1}/data/data/table/saveCategory`, - saveTable:`${host1}/data/data/table/saveTable`, - updateCategory:`${host1}/data/data/table/updateCategory`, - deleteCategory:`${host1}/data/data/table/deleteCategory`, - deleteTable:`${host1}/data/data/table/deleteTable`, - previewData:`${host1}/data/data/preview`, + getTableByClassification:`${host}/data/data/table/getTableByClassification`, + getTableByCondition:`${host}/data/data/table/getTableByCondition`, + originalList:`${host}/data/data/table/originalList`, + originalListById:`${host}/data/data/table/originalListById`, + saveCategory:`${host}/data/data/table/saveCategory`, + saveTable:`${host}/data/data/table/saveTable`, + updateCategory:`${host}/data/data/table/updateCategory`, + deleteCategory:`${host}/data/data/table/deleteCategory`, + deleteTable:`${host}/data/data/table/deleteTable`, + previewData:`${host}/data/data/preview`, // 产品管理 - deleteProduct:`${host2}/data/data/product/delete`, - findById:`${host2}/data/data/product/findById`, - listByEntity:`${host2}/data/data/product/listByEntity`, - saveProduct:`${host2}/data/data/product/save`, - updateProduct:`${host2}/data/data/product/update`, - saveRecord:`${host2}/data/data/dataRecord/saveRecord`, + deleteProduct:`${host}/data/data/product/delete`, + findById:`${host}/da3ta/data/product/findById`, + listByEntity:`${host}/data/data/product/listByEntity`, + saveProduct:`${host}/data/data/product/save`, + updateProduct:`${host}/data/data/product/update`, + saveRecord:`${host}/3data/data/dataRecord/saveRecord`, } \ No newline at end of file diff --git a/src/utils/core.js b/src/utils/core.js index 1ea00ad..60aee5c 100644 --- a/src/utils/core.js +++ b/src/utils/core.js @@ -100,9 +100,9 @@ function orderTypeFn (sts) { function orderStatusFn (sts) { const status = { - '1': '待发货', - '2': '已完成', - '3': '已取消' + '0': '待发货', + '1': '已完成', + '2': '已取消' } return status[sts] || '未知状态' } diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue index 580bca7..193584d 100644 --- a/src/views/course/AddCurriculum.vue +++ b/src/views/course/AddCurriculum.vue @@ -87,7 +87,7 @@

练习配置 - +
@@ -127,7 +127,7 @@

考核配置
- +
@@ -161,6 +161,7 @@ + + +
+
+

+ 应用列表 +
+
+ +
+
+ + + + + + + + + + + + + + + 取 消 + 确 定 + + @@ -265,7 +295,8 @@ import courseconfig from './courseconfig.vue' ] }, permissionData: [], - curVisible: false, + curVisible: false,// 联系配置弹框 + showAssess:false,// 考核配置弹框 curData: [ {name:'项目名称',appName:'应用',asset:false,switch:false,contral:false} ], @@ -299,36 +330,36 @@ import courseconfig from './courseconfig.vue' } }, mounted() { - if(this.form.courseId){ - let data = { - courseId: this.form.courseId - } - this.$get(this.api.queryCourseDetails,data).then((res) => { - this.form = { - courseName: res.message[0].course.courseName, - courseType: res.message[0].course.courseType, - disciplineId: res.message[0].course.disciplineId, - professionalClassId: res.message[0].course.professionalClassId, - professionalId: res.message[0].course.professionalId, - courseHours: res.message[0].course.courseHours, - marketPrice: res.message[0].course.marketPrice, - courseIntroduction: res.message[0].course.courseIntroduction, - teachingGoal: res.message[0].course.teachingGoal, - courseId : res.message[0].course.courseId, - systemId: res.message[0].course.systemId - } - this.getProfessionalClassData() - this.getProfessionalData() - this.curData = res.message[0].serviceConfigList - // let arr1 = this.curData - // let result1 = arr1.map(e => e.systemId) - // const set = new Set(result1); - // let set1 = [...set].join() - // this.form.systemId = this.form.systemId.concat(set1) - }).catch((res) => { - }) - } - this.getSubject() + // if(this.form.courseId){ + // let data = { + // courseId: this.form.courseId + // } + // this.$get(this.api.queryCourseDetails,data).then((res) => { + // this.form = { + // courseName: res.message[0].course.courseName, + // courseType: res.message[0].course.courseType, + // disciplineId: res.message[0].course.disciplineId, + // professionalClassId: res.message[0].course.professionalClassId, + // professionalId: res.message[0].course.professionalId, + // courseHours: res.message[0].course.courseHours, + // marketPrice: res.message[0].course.marketPrice, + // courseIntroduction: res.message[0].course.courseIntroduction, + // teachingGoal: res.message[0].course.teachingGoal, + // courseId : res.message[0].course.courseId, + // systemId: res.message[0].course.systemId + // } + // this.getProfessionalClassData() + // this.getProfessionalData() + // this.curData = res.message[0].serviceConfigList + // // let arr1 = this.curData + // // let result1 = arr1.map(e => e.systemId) + // // const set = new Set(result1); + // // let set1 = [...set].join() + // // this.form.systemId = this.form.systemId.concat(set1) + // }).catch((res) => { + // }) + // } + // this.getSubject() }, methods: { saveAdd(form){ diff --git a/src/views/course/Curriculum.vue b/src/views/course/Curriculum.vue index f88dec4..19c401f 100644 --- a/src/views/course/Curriculum.vue +++ b/src/views/course/Curriculum.vue @@ -113,7 +113,9 @@ export default { data() { return { name: localStorage.getItem('ms_username'), - courseData:[], + courseData:[ + {} + ], form: { courseType: '', subjectType: '', @@ -136,7 +138,7 @@ export default { name: '理论课程', value: 2 }], - loading: true + loading: false }; }, mounted() { @@ -154,21 +156,21 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize, } - this.$get(this.api.queryCourse,data).then(res => { - res.message.rows.forEach(e => { - e.courseType = this.courseTypeStatus(e.courseType) - e.courseHours = this.hoursStatus(e.courseHours) - }) - this.courseData = res.message.rows - this.totals = res.message.total - this.loading = false - }).catch(res => {}); + // this.$get(this.api.queryCourse,data).then(res => { + // res.message.rows.forEach(e => { + // e.courseType = this.courseTypeStatus(e.courseType) + // e.courseHours = this.hoursStatus(e.courseHours) + // }) + // this.courseData = res.message.rows + // this.totals = res.message.total + // this.loading = false + // }).catch(res => {}); }, // 获取学科类别 getSubject(){ - this.$get(this.api.queryCourseDiscipline).then(res => { - this.subjectList = res.message - }).catch(res => {}); + // this.$get(this.api.queryCourseDiscipline).then(res => { + // this.subjectList = res.message + // }).catch(res => {}); }, // 清除学科类别 clearClass(){ @@ -266,16 +268,17 @@ export default { this.pageNo = 1 this.getData() }, + // 上下架 changeSwitch (row) { let data = { courseId: row.courseId, isShelves: row.isShelves } - this.$post(this.api.isShelves,data).then((res) => { - this.getData(); - this.$message.success("修改成功！"); - }).catch((res) => { - }) + // this.$post(this.api.isShelves,data).then((res) => { + // this.getData(); + // this.$message.success("修改成功！"); + // }).catch((res) => { + // }) }, } }; diff --git a/src/views/course/assetConfig.vue b/src/views/course/assetConfig.vue index d03ae38..7357b46 100644 --- a/src/views/course/assetConfig.vue +++ b/src/views/course/assetConfig.vue @@ -1,3 +1,4 @@ +// 内容设置组件