@@ -114,7 +118,7 @@
backgroundColor: item.primaryColor,
color: 'white',
}"
- @click="showTask(item.fileName, item.fileVersion)"
+ @click="showTask(item.fileName, item.fileVersion, item.fileSize)"
>升级
@@ -200,8 +204,21 @@
{{ item.id }}
-
升级设备id：
{{ item.deviceId }}
-
创建时间：
{{ item.date + ' ' + item.time }}
+
+ 升级设备id：
{{ item.deviceId }}
+
+
+ 创建时间：
{{
+ item.date + " " + item.time
+ }}
+
+
{})
},
remove(id, fileName, fileVersion, event) {
- this.$confirm(`确定删除固件${fileName}？`, '提示').then(() => {
- remove({ id, fileName, fileVersion }).then((res) => {
- this.$message.success('删除成功')
- event.target.blur()
- this.getList()
- })
+ this.$confirm(`确定删除固件${fileName}？`, '提示').then(async() => {
+ const response = await getTaskList({ fileName, fileVersion })
+ console.log('response', response)
+ if (response.data && response.data.length > 0) {
+ this.$message.error('该固件存在升级记录，无法删除')
+ } else {
+ remove({ id, fileName, fileVersion }).then((res) => {
+ this.$message.success('删除成功')
+ event.target.blur()
+ this.getList()
+ })
+ }
})
},
verify(id, index) {
@@ -526,19 +550,38 @@ export default {
})
}
},
- showTask(fileName, fileVersion) {
+ showTask(fileName, fileVersion, fileSize) {
+ clearInterval()
this.currentFileName = fileName
this.currentFileVersion = fileVersion
+ this.currentFileSize = fileSize
+ const statusList = ['失败', '成功', '进行中', '未开始']
getTaskList({ fileName, fileVersion }).then((res) => {
this.$message.success('升级任务查询成功')
this.taskList = res.data.map((task) => {
- const statusList = ['失败', '成功', '进行中', '未开始']
task.statusDesc = statusList[task.status]
task.date = task.createTime.split(' ')[0]
task.time = task.createTime.split(' ')[1]
+ task.ratio = Math.round(
+ (task.currentProcess / this.currentFileSize) * 100
+ )
return task
})
})
+ setInterval(() => {
+ getTaskList({ fileName, fileVersion }).then((res) => {
+ this.taskList = this.taskList.map((task) => {
+ const temp = res.data.filter(
+ (resTask) => task.id === resTask.id
+ )[0]
+ task.statusDesc = statusList[temp.status]
+ task.ratio = Math.round(
+ (temp.currentProcess / this.currentFileSize) * 100
+ )
+ return task
+ })
+ })
+ }, 5 * 1000)
this.taskListVisible = true
},
retryTask(task) {
@@ -567,14 +610,17 @@ export default {
endTask({ id }).then((res) => {
if (res.code === '200000') {
this.$message.success('任务强制结束成功')
- this.refresh()
+ this.refresh(false)
}
})
})
.catch((err) => {})
},
refresh(needMsg = true) {
- getTaskList({ fileName: this.currentFileName, fileVersion: this.currentFileVersion }).then((res) => {
+ getTaskList({
+ fileName: this.currentFileName,
+ fileVersion: this.currentFileVersion
+ }).then((res) => {
if (needMsg) {
this.$message.success('刷新成功')
}
@@ -824,7 +870,7 @@ export default {
display: grid;
justify-content: space-around;
grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
- grid-template-rows: repeat(auto-fill, 290px);
+ grid-template-rows: repeat(auto-fill, 310px);
grid-gap: 0 20px;
height: 100%;
width: 100%;
@@ -854,7 +900,7 @@ export default {
#fff 5px,
#fff 10px
);
- div {
+ .head {
position: absolute;
left: 50%;
top: 0;
@@ -877,7 +923,7 @@ export default {
font-family: Microsoft YaHei;
line-height: 30px;
color: #2e4765;
- strong{
+ strong {
font-size: 18px;
}
.success {
@@ -891,6 +937,9 @@ export default {
cursor: pointer;
}
}
+ .task_progress {
+ margin: 0px 10px 5px;
+ }
}
}
}
-