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 672422b412
commit ac8d3bba5c
6 changed files with 55 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/utils/api.js
  2. 54
      src/views/order/AddOrder.vue
  3. 9
      src/views/serve/backstage/modelType.vue
  4. 22
      src/views/serve/projectAdd.vue
  5. 6
      src/views/system/manageLog.vue
  6. 17
      src/views/system/staff.vue

4
src/utils/api.js
Unescape View File

@ -227,8 +227,8 @@ export default {
saveStaff: `nakadai/backstageStaff/saveStaff`,
staffDetail: `nakadai/backstageStaff/staffDetail`,
staffList: `nakadai/backstageStaff/staffList`,
importStaff: `nakadai/backstageStaff/importStaff`,
exportFailure: `nakadai/backstageStaff/exportFailure`,
importStaff: `${Setting.host}nakadai/backstageStaff/importStaff`,
exportFailure: `${Setting.host}nakadai/backstageStaff/exportFailure`,
// 角色管理
batchRemove: `users/role/batchRemove`, //批量删除角色

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

@ -120,11 +120,10 @@
<div class="small">
<el-input
class="time-input"
onkeyup="value=this.value.replace(/\D+/g,'')"
:class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled" maxlength="4"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)"
oninput="value=value.replace(/[^0-9.]/g,'')"
@input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
<el-select class="time-select" v-model="scope.row.options" :disabled="viewDisabled||editDisabled" placeholder="请选择" @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)">
<el-option label="日" :value="0"></el-option>
@ -181,7 +180,7 @@
<div class="small">
<el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''"
:disabled="viewDisabled"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
@input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
@change="[allAmount($event,scope.row),calculateDiscount($event,scope.row)]"
v-model="scope.row.finalPrice"
type="text"></el-input>
@ -256,12 +255,12 @@
<el-table-column label="使用期限" align="center" min-width="190">
<template slot-scope="scope">
<div class="small">
<el-input onkeyup="value=this.value.replace(/\D+/g,'')"
<el-input
class="time-input"
:class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled" maxlength="4"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)"
oninput="value=value.replace(/[^0-9.]/g,'')"
@input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
<span style="margin-left:5px">
<el-select class="time-select" v-model="scope.row.options" :disabled="viewDisabled||editDisabled" placeholder="请选择" @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)">
@ -320,7 +319,7 @@
<div class="small">
<el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''"
:disabled="viewDisabled"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
@input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
@change="[dealComputers($event,scope.row),calculateDiscount($event,scope.row),userAmount($event,scope.row)]"
v-model="scope.row.finalPrice"
type="text"></el-input>
@ -342,8 +341,7 @@
<div class="small">
<el-input :class="!scope.row.accountNum&&whetherSubmit?'red':''"
:disabled="viewDisabled"
onkeyup="value=this.value.replace(/\D+/g,'')"
oninput="value=value.replace(/[^0-9.]/g,'')"
@input="scope.row.accountNum = scope.row.accountNum.replace(/[^0-9.]/g,'')"
v-model="scope.row.accountNum"
@change="[dealComputers($event,scope.row),dealBargain($event,scope.row),calculateDiscount($event,scope.row)]"
type="text"></el-input>
@ -357,7 +355,7 @@
<el-input :class="scope.row.totalAmount === '' && whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled"
@blur="[allAmount($event,scope.row),allAmountChange($event,scope.row),calculateDiscount($event,scope.row)]"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
@input="scope.row.totalAmount = scope.row.totalAmount.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
v-model="scope.row.totalAmount"
type="text"></el-input>
</div>
@ -1336,25 +1334,25 @@ export default {
// 使用期限转换以及计算剩余天数
deadLine(e,row,options, isDate) {
// 只有改变了起止日期才需要调接口查询订单，该接口作用是把开始时间传过去，会返回一个提示或者时间，如果是时间，则把时间+1天，如果是提示，则无法保存
// if (isDate) {
// const date = row.startTime
// const orderRepeat = this.orderRepeat
// this.$post(this.api.getOrderOtherTime, {
// customerId: this.form.customerId,
// id: row.dataOrCourseId,
// startTime: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
// }).then(res => {
// if (res.endTime) {
// orderRepeat.includes(row.id) && orderRepeat.splice(orderRepeat.findIndex(e => e === row.id), 1)
// let time = new Date(res.endTime)
// time = new Date(time.setDate(time.getDate() + 1))
// row.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
// }
// }).catch(res => {
// this.repeatMsg = res.message
// orderRepeat.includes(row.id) || orderRepeat.push(row.id)
// })
// }
if (isDate) {
const date = row.startTime
const orderRepeat = this.orderRepeat
this.$post(this.api.getOrderOtherTime, {
customerId: this.form.customerId,
id: row.dataOrCourseId,
startTime: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
}).then(res => {
if (res.endTime) {
orderRepeat.includes(row.id) && orderRepeat.splice(orderRepeat.findIndex(e => e === row.id), 1)
let time = new Date(res.endTime)
time = new Date(time.setDate(time.getDate() + 1))
row.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
}
}).catch(res => {
this.repeatMsg = res.message
orderRepeat.includes(row.id) || orderRepeat.push(row.id)
})
}
let optionsData = ''
if(e > 0){
if (options == 1){

9
src/views/serve/backstage/modelType.vue
Unescape View File

@ -123,7 +123,14 @@ export default {
// 同步原始模型前删除原有数据
this.$post(`${this.api.delModelInfoBySystemId}?systemId=${this.systemId}`).then(res => {
this.$post(`${this.api.synchronizationMdel}?systemId=${this.systemId}`).then(res => {
this.getType()
this.$router.push({
path: 'backstage',
query: {
...this.$route.query,
categoryId: ''
}
})
this.getType()
})
}).catch(() => {})
},

22
src/views/serve/projectAdd.vue
Unescape View File

@ -287,7 +287,7 @@ export default {
return 0;
}
if (score > 100) {
this.$message.warning("分配的数值已超过100");
this.$message.error("分配的数值已超过100");
}
return score;
}
@ -392,36 +392,36 @@ export default {
hintOpen
} = this.projectManage;
if (!projectName) {
this.$message.warning("请输入项目名称");
this.$message.error("请输入项目名称");
return false;
}
if (this.projectNameRepeat) {
this.$message.warning("该项目名称已存在");
this.$message.error("项目名称重复!");
return false;
}
if (state) {
if (!experimentTarget || !this.removeTag(experimentTarget)) {
this.$message.warning("请输入实验目标");
this.$message.error("请输入实验目标");
return false;
}
if (!experimentDescription || !this.removeTag(experimentDescription)) {
this.$message.warning("请输入案例描述");
this.$message.error("请输入案例描述");
return false;
}
if (this.projectJudgmentData.length == 0) {
this.$message.warning("请添加判分点");
this.$message.error("请添加判分点");
return false;
}
if (this.handDistributionScore < 100) {
this.$message.warning("判分点分数未满100");
this.$message.error("判分点分数未满100");
return false;
}
if (this.handDistributionScore > 100) {
this.$message.warning("判分点分数已超过100");
this.$message.error("判分点分数已超过100");
return false;
}
if ((!experimentHint || !this.removeTag(experimentHint)) && hintOpen == 0) {
this.$message.warning("请输入实验提示");
this.$message.error("请输入实验提示");
return false;
}
}
@ -551,7 +551,7 @@ export default {
}).catch(() => {
});
} else {
this.$message.warning("请选择判分点");
this.$message.error("请选择判分点");
}
},
handleAddJudgment() { // 处理添加判分点
@ -639,7 +639,7 @@ export default {
this.$refs.projectJudgementTable.clearSelection();
});
} else {
this.$message.warning("请选择判分点");
this.$message.error("请选择判分点");
}
},
// 行拖拽

6
src/views/system/manageLog.vue
Unescape View File

@ -5,7 +5,7 @@
<div class="per_title" v-preventReClick @click="$router.back()">
<i class="el-icon-arrow-left"></i>
<span class="per_back">返回</span>
<span class="per_school">职站日志管理</span>
<span class="per_school">{{ platformName }}日志管理</span>
</div>
</div>
</el-card>
@ -95,11 +95,11 @@ export default {
getData() {
this.$get(`${this.api.platformLogList}?platformId=${this.platformId}&versionName=${this.versionName}`).then(res => {
const { logList } = res
if (logList.length) {
this.listData = logList
if (logList.length) {
const vers = []
const platformName = Setting.platformList.find(e => e.id === logList[0].platformId).name
this.platformName = platformName
this.listData = logList
logList.map((e, i) => {
e.logContents.map(n => {
n.content = n.content.split('\n')

17
src/views/system/staff.vue
Unescape View File

@ -186,7 +186,6 @@
:action="this.api.importStaff"
:file-list="uploadList"
:headers="headers"
:auto-upload="false"
>
<el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
</el-upload>
@ -706,14 +705,6 @@ export default {
showFaild() {
location.href = `${this.api.exportFailure}?exportCode=${this.exportCode}`
},
// 上传成功后重置渲染
importSuccess() {
this.importVisible = false
this.studentType = 1
this.keyWord = ''
this.$refs.orgTree.setCurrentKey(null)
this.getOrg()
},
uploadSuccess(res, file, fileList) {
this.uploadFaild = false
if (res.status === 200) {
@ -721,8 +712,6 @@ export default {
this.exportCode = res.data.exportCode
this.uploadFaild = true
util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`)
} else {
this.importSuccess()
}
} else {
res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据")
@ -743,7 +732,11 @@ export default {
this.uploadFaild = false
},
uploadSure() {
this.uploadFaild ? this.importSuccess() : this.$refs.importStaff.submit()
this.importVisible = false
this.studentType = 1
this.keyWord = ''
this.$refs.orgTree.setCurrentKey(null)
this.getOrg()
}
}
};

Write Preview
Loading…
Cancel
Save