diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 832e786..543fcbb 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -94,7 +94,7 @@ export default {
},
],
menus: [],
- onRoutes:'customer'
+ onRoutes: this.$route.path
};
},
watch:{
diff --git a/src/setting.js b/src/setting.js
index 1f71347..82aca0a 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -13,9 +13,9 @@ if (isDev) {
// jumpPath = "http://39.108.250.202/judgmentPoint/";
jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
// host = "http://www.huorantech.cn:9000";//线上
- // host = "http://39.108.250.202:9000/";//测试
+ host = "http://39.108.250.202:9000/";//测试
// host = 'http://192.168.31.151:9000/'// 榕
- host = 'http://192.168.31.137:9000/'// 赓
+ // host = 'http://192.168.31.137:9000/'// 赓
} else if (isTest) {
// jumpPath = "http://124.71.12.62/judgmentPoint/";
jumpPath = "http://39.108.250.202/judgmentPoint/";
diff --git a/src/utils/api.js b/src/utils/api.js
index c56cd8c..678c68d 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -218,17 +218,17 @@ export default {
getKeywordByCategoryId: `data/keyword/getKeywordByCategoryId`,
// 后台账号
- deleteArch: `${host}nakadai/staffAccountArchitecture/delete`,
- saveArch: `${host}nakadai/staffAccountArchitecture/save`,
- treeListArch: `${host}nakadai/staffAccountArchitecture/treeList`,
- updateArch: `${host}nakadai/staffAccountArchitecture/update`,
- delStaff: `${host}nakadai/backstageStaff/delStaff`,
- modifyStaff: `${host}nakadai/backstageStaff/modifyStaff`,
- saveStaff: `${host}nakadai/backstageStaff/saveStaff`,
- staffDetail: `${host}nakadai/backstageStaff/staffDetail`,
- staffList: `${host}nakadai/backstageStaff/staffList`,
- importStaff: `${host}nakadai/backstageStaff/importStaff`,
- exportFailure: `${host}nakadai/backstageStaff/exportFailure`,
+ deleteArch: `nakadai/staffAccountArchitecture/delete`,
+ saveArch: `nakadai/staffAccountArchitecture/save`,
+ treeListArch: `nakadai/staffAccountArchitecture/treeList`,
+ updateArch: `nakadai/staffAccountArchitecture/update`,
+ delStaff: `nakadai/backstageStaff/delStaff`,
+ modifyStaff: `nakadai/backstageStaff/modifyStaff`,
+ saveStaff: `nakadai/backstageStaff/saveStaff`,
+ staffDetail: `nakadai/backstageStaff/staffDetail`,
+ staffList: `nakadai/backstageStaff/staffList`,
+ importStaff: `nakadai/backstageStaff/importStaff`,
+ exportFailure: `nakadai/backstageStaff/exportFailure`,
// 角色管理
batchRemove: `users/role/batchRemove`, //批量删除角色
diff --git a/src/views/Login.vue b/src/views/Login.vue
index d6c44d2..5e19fad 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -198,9 +198,10 @@ export default {
const { message } = res
sessionStorage.setItem('token',res.data.token)
this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
+ const list = res.permissionMenu
this.$message.success(message);
this.$router.push({
- path:'/customer'
+ path: list[0].children[0].path
});
localStorage.setItem('ms_username', this.param.username);
}).catch(err => {
diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue
index db44aba..ee807df 100644
--- a/src/views/course/AddCurriculum.vue
+++ b/src/views/course/AddCurriculum.vue
@@ -136,7 +136,11 @@
-
+
+
+ {{ permissionData.find(e => e.systemId == scope.row.systemId).systemName }}
+
+
-
+
+
+ {{ permissionData.find(e => e.systemId == scope.row.systemId).systemName }}
+
+
!e.type) && list.find(e => e.type === 1)) {
+ return this.$message.warning('请勿同时选择编程类和流程类的系统！')
} else {
this.getConfigData();
this.configVisible = false;
diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index 717fd93..5bf63c5 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -74,6 +74,8 @@
+
+
重置密码
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index 1f43d8e..62a6b32 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -852,7 +852,7 @@ export default {
}
e.endTime = "";
e.periodOfUse = "";
- } else {
+ } else if (!this.viewDisabled) { // 如果不是查看
e.startTime = item.startTime.split(" ")[0];
e.endTime = item.endTime.split(" ")[0];
}
@@ -1116,9 +1116,9 @@ export default {
this.coursePermissions.map(e => {
res.orderOthers.map(el => {
if (el.dataOrCourseId === e.dataOrCourseId && el.authority) {
- let time = el.endTime.split(" ")[0];
- let arr = time.split("-");
- e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1);
+ let time = new Date(el.endTime)
+ time = new Date(time.setDate(time.getDate() + 1))
+ e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
e.endTime = "";
e.periodOfUse = "";
e.renew = true;
@@ -1228,9 +1228,9 @@ export default {
this.dataPlatformPermissions.map(e => {
res.orderOthers.map(el => {
if (el.dataOrCourseId === e.dataOrCourseId && !el.authority) {
- let time = el.endTime.split(" ")[0];
- let arr = time.split("-");
- e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1);
+ let time = new Date(el.endTime)
+ time = new Date(time.setDate(time.getDate() + 1))
+ e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
e.endTime = "";
e.periodOfUse = "";
e.renew = true;