-
{{ scope.row.storeContent }}

@@ -312,7 +321,7 @@ function comparePercentage(percentStr: any) {
- {{
+ {{
comparePercentage(scope.row) }}
diff --git a/web/src/views/testdata/datamanagement/index.vue b/web/src/views/testdata/datamanagement/index.vue
index af19cde..802a6d3 100644
--- a/web/src/views/testdata/datamanagement/index.vue
+++ b/web/src/views/testdata/datamanagement/index.vue
@@ -86,7 +86,7 @@ function setupWebSocket() {
};
ws1.onmessage = (e) => {
console.log('websocket接收到消息', e)
- tonstatus()
+ tonstatus(true)
}
ws1.onclose = () => {
@@ -116,25 +116,26 @@ function getProject() {
ws1 = new WebSocket(userStore.WebSocketUrl + '/websocket/' + 'taskId_' + projectId.value)
setupWebSocket()
gettreedata()
- tonstatus()
+ tonstatus(false)
})
}
//扫描
function scan() {
testDataScanById({ id: projectId.value }).then((res: any) => {
- tonstatus()
+ tonstatus(false)
})
}
const tonloading = ref(false)
const buttonmsg = ref('扫描试验数据')
-function tonstatus() {
+function tonstatus(ready: any) {
//sao
obtaintestData({ id: projectId.value }).then((res: any) => {
if (res.data.status == '1') {
tonloading.value = false
buttonmsg.value = '扫描试验数据'
+ readyto(ready)
} else {
tonloading.value = true
buttonmsg.value = '处理中...'
@@ -143,6 +144,22 @@ function tonstatus() {
})
}
+function readyto(ready: any) {
+ if (ready) {
+ ElMessageBox.confirm(
+ '项目扫描成功',
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }
+ )
+ .then(() => {
+
+ })
+ }
+}
//左侧树配置
const treedata = ref([])
const treeloading = ref(false)
@@ -1668,10 +1685,11 @@ function repstring(row: any) {
{{ data.nodeName }}
+
-
+
@@ -2186,7 +2204,7 @@ function repstring(row: any) {
.img_tree {
display: flex;
- width: 20%;
+ width: 25%;
align-items: center;
justify-content: space-between;
diff --git a/web/src/views/testdata/fileSynchronization/index.vue b/web/src/views/testdata/fileSynchronization/index.vue
index 512232b..790dc9d 100644
--- a/web/src/views/testdata/fileSynchronization/index.vue
+++ b/web/src/views/testdata/fileSynchronization/index.vue
@@ -38,7 +38,7 @@ function setupWebSocket() {
};
ws1.onmessage = (e) => {
console.log('websocket接收到消息', e)
- tonstatus()
+ tonstatus(true)
}
ws1.onclose = () => {
@@ -108,12 +108,13 @@ function gettreeTwo() {
///
const tonloading = ref(false)
const buttonmsg = ref('文件备份')
-function tonstatus() {
+function tonstatus(ready: any) {
//sao
automaticFileBackupData({ nodeId: pathid.value, taskId: projectId.value }).then((res: any) => {
if (res.data.status == '1') {
tonloading.value = false
buttonmsg.value = '文件备份'
+ readyto(ready)
} else {
tonloading.value = true
buttonmsg.value = '处理中...'
@@ -122,6 +123,22 @@ function tonstatus() {
getminiotree()
})
}
+function readyto(ready: any) {
+ if (ready) {
+ ElMessageBox.confirm(
+ '项目扫描成功',
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }
+ )
+ .then(() => {
+
+ })
+ }
+}
////
function backups() {
ElMessageBox.confirm(
@@ -155,14 +172,14 @@ function backups() {
automaticFileBackupByIds(params).then((res: any) => {
if (res.code == 0) {
comparearr.value.length = 0
- tonstatus()
+ tonstatus(false)
}
})
} else {
automaticFileBackup(params).then((res: any) => {
if (res.code == 0) {
comparearr.value.length = 0
- tonstatus()
+ tonstatus(false)
}
})
}
@@ -396,7 +413,7 @@ function handleNodeClick(data: any, node: any) {
setupWebSocket()
getlocaltree()
getminiotree()
- tonstatus()
+ tonstatus(false)
}
//工作空间树点击
const handleCheckChange = (
diff --git a/web/src/views/testdata/testtask/index.vue b/web/src/views/testdata/testtask/index.vue
index 1397d98..42d8909 100644
--- a/web/src/views/testdata/testtask/index.vue
+++ b/web/src/views/testdata/testtask/index.vue
@@ -521,10 +521,10 @@ let result2 = ref([])
-->
-
+
-
+