huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

课程等修复

Browse Source
dev_2022-03-03
yujialong 3 years ago
parent d1897ccc3f
commit 672422b412
7 changed files with 39 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/components/Sidebar.vue
  2. 4
      src/setting.js
  3. 22
      src/utils/api.js
  4. 3
      src/views/Login.vue
  5. 17
      src/views/course/AddCurriculum.vue
  6. 2
      src/views/customer/customer.vue
  7. 14
      src/views/order/AddOrder.vue

2
src/components/Sidebar.vue
Unescape View File

@ -94,7 +94,7 @@ export default {
}, },
], ],
menus: [], menus: [],
onRoutes:'customer' onRoutes: this.$route.path
}; };
}, },
watch:{ watch:{

4
src/setting.js
Unescape View File

@ -13,9 +13,9 @@ if (isDev) {
// jumpPath = "http://39.108.250.202/judgmentPoint/"; // jumpPath = "http://39.108.250.202/judgmentPoint/";
jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统 jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
// host = "http://www.huorantech.cn:9000";//线上 // 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.151:9000/'// 榕
host = 'http://192.168.31.137:9000/'// 赓 // host = 'http://192.168.31.137:9000/'// 赓
} else if (isTest) { } else if (isTest) {
// jumpPath = "http://124.71.12.62/judgmentPoint/"; // jumpPath = "http://124.71.12.62/judgmentPoint/";
jumpPath = "http://39.108.250.202/judgmentPoint/"; jumpPath = "http://39.108.250.202/judgmentPoint/";

22
src/utils/api.js
Unescape View File

@ -218,17 +218,17 @@ export default {
getKeywordByCategoryId: `data/keyword/getKeywordByCategoryId`, getKeywordByCategoryId: `data/keyword/getKeywordByCategoryId`,
// 后台账号 // 后台账号
deleteArch: `${host}nakadai/staffAccountArchitecture/delete`, deleteArch: `nakadai/staffAccountArchitecture/delete`,
saveArch: `${host}nakadai/staffAccountArchitecture/save`, saveArch: `nakadai/staffAccountArchitecture/save`,
treeListArch: `${host}nakadai/staffAccountArchitecture/treeList`, treeListArch: `nakadai/staffAccountArchitecture/treeList`,
updateArch: `${host}nakadai/staffAccountArchitecture/update`, updateArch: `nakadai/staffAccountArchitecture/update`,
delStaff: `${host}nakadai/backstageStaff/delStaff`, delStaff: `nakadai/backstageStaff/delStaff`,
modifyStaff: `${host}nakadai/backstageStaff/modifyStaff`, modifyStaff: `nakadai/backstageStaff/modifyStaff`,
saveStaff: `${host}nakadai/backstageStaff/saveStaff`, saveStaff: `nakadai/backstageStaff/saveStaff`,
staffDetail: `${host}nakadai/backstageStaff/staffDetail`, staffDetail: `nakadai/backstageStaff/staffDetail`,
staffList: `${host}nakadai/backstageStaff/staffList`, staffList: `nakadai/backstageStaff/staffList`,
importStaff: `${host}nakadai/backstageStaff/importStaff`, importStaff: `nakadai/backstageStaff/importStaff`,
exportFailure: `${host}nakadai/backstageStaff/exportFailure`, exportFailure: `nakadai/backstageStaff/exportFailure`,
// 角色管理 // 角色管理
batchRemove: `users/role/batchRemove`, //批量删除角色 batchRemove: `users/role/batchRemove`, //批量删除角色

3
src/views/Login.vue
Unescape View File

@ -198,9 +198,10 @@ export default {
const { message } = res const { message } = res
sessionStorage.setItem('token',res.data.token) sessionStorage.setItem('token',res.data.token)
this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => { this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
const list = res.permissionMenu
this.$message.success(message); this.$message.success(message);
this.$router.push({ this.$router.push({
path:'/customer' path: list[0].children[0].path
}); });
localStorage.setItem('ms_username', this.param.username); localStorage.setItem('ms_username', this.param.username);
}).catch(err => { }).catch(err => {

17
src/views/course/AddCurriculum.vue
Unescape View File

@ -136,7 +136,11 @@
<el-table-column type="selection" width="55" align="center"></el-table-column> <el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" width="100" label="序号" align="center"></el-table-column> <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
<el-table-column prop="projectName" label="项目名称" align="center"></el-table-column> <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
<el-table-column prop="applicationName" label="系统名称" align="center"></el-table-column> <el-table-column prop="applicationName" label="系统名称" align="center">
<template slot-scope="scope">
{{ permissionData.find(e => e.systemId == scope.row.systemId).systemName }}
</template>
</el-table-column>
<el-table-column label="排序" align="center" width="100"> <el-table-column label="排序" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model.trim="scope.row.sort" <el-input v-model.trim="scope.row.sort"
@ -182,7 +186,11 @@
<el-table-column type="selection" width="55" align="center"></el-table-column> <el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" width="100" label="序号" align="center"></el-table-column> <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
<el-table-column prop="projectName" label="项目名称" align="center"></el-table-column> <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
<el-table-column prop="applicationName" label="系统名称" align="center"></el-table-column> <el-table-column prop="applicationName" label="系统名称" align="center">
<template slot-scope="scope">
{{ permissionData.find(e => e.systemId == scope.row.systemId).systemName }}
</template>
</el-table-column>
<el-table-column label="排序" align="center" width="100"> <el-table-column label="排序" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model.trim="scope.row.sort" <el-input v-model.trim="scope.row.sort"
@ -509,9 +517,12 @@ export default {
this.getConfig(); this.getConfig();
}, },
handleConfirm() { // 确认系统 handleConfirm() { // 确认系统
if (!this.multipleSelection.length) { const list = this.multipleSelection
if (!list.length) {
this.$message.warning("请选择系统！"); this.$message.warning("请选择系统！");
return; return;
} else if (list.find(e => !e.type) && list.find(e => e.type === 1)) {
return this.$message.warning('请勿同时选择编程类和流程类的系统！')
} else { } else {
this.getConfigData(); this.getConfigData();
this.configVisible = false; this.configVisible = false;

2
src/views/customer/customer.vue
Unescape View File

@ -74,6 +74,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="account" label="账号" align="center"> <el-table-column prop="account" label="账号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="loginNumber" label="登录次数" align="center">
</el-table-column>
<el-table-column label="操作" width="270" align="center"> <el-table-column label="操作" width="270" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="resetPassword(scope.row)" v-auth>重置密码</el-button> <el-button type="text" @click="resetPassword(scope.row)" v-auth>重置密码</el-button>

14
src/views/order/AddOrder.vue
Unescape View File

@ -852,7 +852,7 @@ export default {
} }
e.endTime = ""; e.endTime = "";
e.periodOfUse = ""; e.periodOfUse = "";
} else { } else if (!this.viewDisabled) { // 如果不是查看
e.startTime = item.startTime.split(" ")[0]; e.startTime = item.startTime.split(" ")[0];
e.endTime = item.endTime.split(" ")[0]; e.endTime = item.endTime.split(" ")[0];
} }
@ -1116,9 +1116,9 @@ export default {
this.coursePermissions.map(e => { this.coursePermissions.map(e => {
res.orderOthers.map(el => { res.orderOthers.map(el => {
if (el.dataOrCourseId === e.dataOrCourseId && el.authority) { if (el.dataOrCourseId === e.dataOrCourseId && el.authority) {
let time = el.endTime.split(" ")[0]; let time = new Date(el.endTime)
let arr = time.split("-"); time = new Date(time.setDate(time.getDate() + 1))
e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1); e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
e.endTime = ""; e.endTime = "";
e.periodOfUse = ""; e.periodOfUse = "";
e.renew = true; e.renew = true;
@ -1228,9 +1228,9 @@ export default {
this.dataPlatformPermissions.map(e => { this.dataPlatformPermissions.map(e => {
res.orderOthers.map(el => { res.orderOthers.map(el => {
if (el.dataOrCourseId === e.dataOrCourseId && !el.authority) { if (el.dataOrCourseId === e.dataOrCourseId && !el.authority) {
let time = el.endTime.split(" ")[0]; let time = new Date(el.endTime)
let arr = time.split("-"); time = new Date(time.setDate(time.getDate() + 1))
e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1); e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
e.endTime = ""; e.endTime = "";
e.periodOfUse = ""; e.periodOfUse = "";
e.renew = true; e.renew = true;

Write Preview
Loading…
Cancel
Save