Merge remote-tracking branch 'origin/apps_dev' into apps_dev

This commit is contained in:
Mr-wang 2023-10-18 17:04:30 +08:00
commit 7398f7aae3

View File

@ -671,7 +671,7 @@ function showlist(data, type, pageNumber, start){
targetId = curr.changedFileIdNew;
}
var outputName = getOutputName(curr.category, curr.methodId);
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + targetFileName + "-" + outputName + '</a><span id="download_output_' + curr.publishFileId + '" style="cursor: pointer;" onclick="downloadReport(\'' + curr.publishFileId + '\',\'' + curr.taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;">&#xe653;</i></span>';
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + targetFileName + "-" + outputName + '</a><span id="download_output_' + curr.changedFileIdNew + '" style="cursor: pointer;" onclick="downloadReport(\'' + curr.changedFileIdNew + '\',\'' + curr.taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;">&#xe653;</i></span>';
/*if(outputName==""){
var reportName = "";
}*/
@ -786,10 +786,6 @@ function showlist(data, type, pageNumber, start){
var fName = '';
var upFileId = curr.upfileId;
var stopNumber='';
if (curr.stopNumber != undefined && curr.stopNumber != '') {
stopNumber = curr.stopNumber;
}
if(upFileId!=''&&upFileId!=undefined){
for(var i = 0; i < upFileId.length; i++){
var upFileJson = upFileId[i]
@ -820,8 +816,7 @@ function showlist(data, type, pageNumber, start){
html += '<td ' + tableTdCss + '>' + reportName +'</td>';
}
//html += '<td style="padding:1px;"><textarea onblur="changeDesc(\'stop\',\'' + curr.stopFileId + '\', this)" style="width:100%;height:30px;" ' + textareaPerm + ' class="awsui-input">' + curr.stopDesc + '</textarea></td>';
html += '<td ' + tableTdCss + '>' + stopNumber + '</td>';
html += '<td style="padding:1px;"><textarea onblur="changeDesc(\'stop\',\'' + curr.stopFileId + '\', this)" style="width:100%;height:30px;" ' + textareaPerm + ' class="awsui-input">' + curr.stopDesc + '</textarea></td>';
html += '</tr>';
}
}
@ -1566,8 +1561,6 @@ function getStopBatchResult(type) {
obj.methodId = node.method;
obj.category = node.category;
obj.taskId = "";// 后续查询已经存在的流程手册
//废止文件编号
obj.stopNumber=node.stopNumber;
treeCheckedStopArr.push(obj);
}
}