【类 型】:feat
【主 题】:站点更新模块 强制更新功能 【描 述】: [原因]:runing字段有飞机在执行任务 也可强制更新站点 [过程]:先正常提交 判断有在执行任务 弹出选择提示框 可强制更新 再次提交 跳过runing字段检查 [影响]: 【结 束】 # 类型 包含: # feat:新功能(feature) # fix:修补bug # docs:文档(documentation) # style: 格式(不影响代码运行的变动) # refactor:重构(即不是新增功能,也不是修改bug的代码变动) # test:增加测试 # chore:构建过程或辅助工具的变动
This commit is contained in:
parent
f8efe12fe0
commit
a81849dadd
@ -450,6 +450,24 @@ const store = new Vuex.Store({
|
|||||||
if (res.data.status === 1) {
|
if (res.data.status === 1) {
|
||||||
await dispatch('fetchSiteList')// 刷新站点列表
|
await dispatch('fetchSiteList')// 刷新站点列表
|
||||||
Message.success(res.data.msg)
|
Message.success(res.data.msg)
|
||||||
|
} else if (res.data.status === -1) { // -1状态 服务器判断runing字段 正在有飞机正在执行
|
||||||
|
MessageBox.confirm(res.data.msg, '提示', {
|
||||||
|
confirmButtonText: '强制更新',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning'
|
||||||
|
}).then(() => {
|
||||||
|
params.append('isCoerce', 1)
|
||||||
|
api.post('saveSite', params).then(res => {
|
||||||
|
if (res.data.status === 1) {
|
||||||
|
Message.success(res.data.msg)
|
||||||
|
dispatch('fetchSiteList')// 刷新站点列表
|
||||||
|
} else {
|
||||||
|
Message.error(res.data.msg)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}).catch(() => {
|
||||||
|
Message.info('取消操作')
|
||||||
|
})
|
||||||
} else {
|
} else {
|
||||||
Message.error(res.data.msg)
|
Message.error(res.data.msg)
|
||||||
}
|
}
|
||||||
|
@ -25,10 +25,8 @@
|
|||||||
<el-upload class="avatar-uploader" drag name="file" :action="action" :headers="myheader"
|
<el-upload class="avatar-uploader" drag name="file" :action="action" :headers="myheader"
|
||||||
:show-file-list="false" :on-success="handleUpSuccess" :on-error="handleUpErr"
|
:show-file-list="false" :on-success="handleUpSuccess" :on-error="handleUpErr"
|
||||||
:before-upload="beforeAvatarUpload">
|
:before-upload="beforeAvatarUpload">
|
||||||
<img v-if="form.upFile != ''"
|
<img v-if="form.upFile != ''" :src="$store.state.settings.tempPath + form.upFile" class="avatar" />
|
||||||
:src="$store.state.settings.tempPath + form.upFile" class="avatar" />
|
<img v-else-if="defaultQr != '' && form.upFile == ''" :src="defaultQr" class="avatar" />
|
||||||
<img v-else-if="defaultQr != '' && form.upFile == ''"
|
|
||||||
:src="defaultQr" class="avatar" />
|
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<i class="el-icon-plus f-s-30 m-t-70 seatFontColor"></i>
|
<i class="el-icon-plus f-s-30 m-t-70 seatFontColor"></i>
|
||||||
<div class="el-upload__text"><em>空为默认LOGO</em></div>
|
<div class="el-upload__text"><em>空为默认LOGO</em></div>
|
||||||
@ -216,7 +214,6 @@ export default {
|
|||||||
this.initPage()// 初始化页面
|
this.initPage()// 初始化页面
|
||||||
},
|
},
|
||||||
routeList () {
|
routeList () {
|
||||||
console.log(this.routeData)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
|
Loading…
Reference in New Issue
Block a user