@@ -342,8 +341,7 @@
@@ -357,7 +355,7 @@
@@ -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){
diff --git a/src/views/serve/backstage/modelType.vue b/src/views/serve/backstage/modelType.vue
index 42d6504..367a869 100644
--- a/src/views/serve/backstage/modelType.vue
+++ b/src/views/serve/backstage/modelType.vue
@@ -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(() => {})
},
diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue
index 457653a..c898aca 100644
--- a/src/views/serve/projectAdd.vue
+++ b/src/views/serve/projectAdd.vue
@@ -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("请选择判分点");
}
},
// 行拖拽
diff --git a/src/views/system/manageLog.vue b/src/views/system/manageLog.vue
index a3a8090..2e0cf18 100644
--- a/src/views/system/manageLog.vue
+++ b/src/views/system/manageLog.vue
@@ -5,7 +5,7 @@
返回
- 职站日志管理
+ {{ platformName }}日志管理
@@ -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')
diff --git a/src/views/system/staff.vue b/src/views/system/staff.vue
index 25854c3..442f2d5 100644
--- a/src/views/system/staff.vue
+++ b/src/views/system/staff.vue
@@ -186,7 +186,6 @@
:action="this.api.importStaff"
:file-list="uploadList"
:headers="headers"
- :auto-upload="false"
>