Front_Team/SPDM
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lijing1
2026-01-20 13:18:15 +08:00
parent e9e3bb6c9b 161540d385
commit b8cacfb9f4
5 changed files with 100 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/data/analysis/components/csvFileReview.vue
View File

@@ -106,7 +106,9 @@ const initCsvChartFun = async (id: any) => {
xAxis: {
type: 'value',
// type: 'category',
name: props.row.xquantityType + '（ 单位：' + props.row.xunits + ' ）',
name: props.row.xquantityType
? props.row.xquantityType + '（ 单位：' + props.row.xunits + ' ）'
: '',
nameGap: 40, // 与轴线的距离
nameTextStyle: {
align: 'right', // 文字右对齐
@@ -130,7 +132,9 @@ const initCsvChartFun = async (id: any) => {
},
},
yAxis: {
name: props.row.yquantityType + '（单位：' + props.row.yunits + '）',
name: props.row.yquantityType
? props.row.yquantityType + '（单位：' + props.row.yunits + '）'
: '',
type: 'value',
axisLine: {
show: true,

69
src/views/data/statistics/index.vue
View File

@@ -96,7 +96,7 @@
</el-form-item>
<el-form-item label="学科">
<el-select
v-model="userTaskCompleteFormData.tag2"
v-model="userTaskCompleteFormData.discipline"
clearable
class="select-width margin-right-12"
@change="userTaskCompleteProjectChangeFun"
@@ -172,7 +172,7 @@
<el-select
clearable
class="select-width margin-right-12"
v-model="userDifficultyCoefficientFormData.tag2"
v-model="userDifficultyCoefficientFormData.discipline"
@change="initUserDifficultyCoefficientStatistics"
>
<el-option
@@ -330,7 +330,7 @@
</el-form-item>
<el-form-item label="学科">
<el-select
v-model="reviewPassedChartFormData.tag2"
v-model="reviewPassedChartFormData.discipline"
clearable
class="select-width margin-right-12"
@change="reviewPassedChangeFun"
@@ -470,6 +470,7 @@ const initUserProjectStatistics = async () => {
const { xData, yData } = await getUserGroupProjectStatistics();
// 模拟接口延时
if (!userProjectChartRef.value || !userProjectChartRef.value.commonChartRef) return;
userProjectChartRef.value.commonChartRef.disposeEchartsByKey('chart-1');
userProjectChartRef.value.commonChartRef.option = {
title: {
@@ -518,7 +519,7 @@ const userTaskCompleteFormData = ref<any>({
userGroupId: '',
userId: '',
tag1: '',
tag2: '',
discipline: '',
});
const userTaskCompleteProjectChangeFun = async () => {
await initUserTaskComplete();
@@ -570,6 +571,7 @@ const getUserGroupTaskCompleteStatistics = async () => {
const initUserTaskComplete = async () => {
const { xData, seriesData, legendData } = await getUserGroupTaskCompleteStatistics();
// 模拟接口延时
if (!userTaskCompleteChartRef.value || !userTaskCompleteChartRef.value.commonChartRef) return;
userTaskCompleteChartRef.value.commonChartRef.disposeEchartsByKey('chart-2');
userTaskCompleteChartRef.value.commonChartRef.option = {
color: statusColorList,
@@ -608,7 +610,7 @@ const userDifficultyCoefficientFormData = reactive<any>({
userGroupId: '',
userId: '',
tag1: '',
tag2: '',
discipline: '',
});
const userDifficultyCoefficientChartRef = ref();
const initUserDifficultyCoefficientStatistics = async () => {
@@ -618,18 +620,7 @@ const initUserDifficultyCoefficientStatistics = async () => {
const seriesData: any = [];
const res: any = await getUserGroupDifficultyStatisticsApi({
userGroupId: userDifficultyCoefficientFormData.userGroupId,
userId: userDifficultyCoefficientFormData.userId,
tag1: userDifficultyCoefficientFormData.tag1,
tag2: userDifficultyCoefficientFormData.tag2,
tag3: '',
tag4: '',
tag5: '',
tag6: '',
tag7: '',
tag8: '',
tag9: '',
tag10: '',
...userDifficultyCoefficientFormData,
});
if (res && res.code === 200) {
@@ -661,6 +652,11 @@ const initUserDifficultyCoefficientStatistics = async () => {
}
// 模拟接口延时
if (
!userDifficultyCoefficientChartRef.value ||
!userDifficultyCoefficientChartRef.value.commonChartRef
)
return;
userDifficultyCoefficientChartRef.value.commonChartRef.disposeEchartsByKey('chart-3');
userDifficultyCoefficientChartRef.value.commonChartRef.option = {
color: difficultyCountColorList,
@@ -765,7 +761,11 @@ const initTaskCompletionAtWorkstations = async () => {
seriesData.push(obj);
}
}
if (
!taskCompletionAtWorkstationsChartRef.value ||
!taskCompletionAtWorkstationsChartRef.value.commonChartRef
)
return;
taskCompletionAtWorkstationsChartRef.value.commonChartRef.disposeEchartsByKey('chart-4');
taskCompletionAtWorkstationsChartRef.value.commonChartRef.option = {
color: statusColorList,
@@ -861,7 +861,11 @@ const initTaskCompletionAtDiscipline = async () => {
seriesData.push(obj);
}
}
if (
!taskCompletionAtDisciplineChartRef.value ||
!taskCompletionAtDisciplineChartRef.value.commonChartRef
)
return;
taskCompletionAtDisciplineChartRef.value.commonChartRef.disposeEchartsByKey('chart-5');
taskCompletionAtDisciplineChartRef.value.commonChartRef.option = {
color: statusColorList,
@@ -955,6 +959,11 @@ const initPerformanceCompletionAtWorkstations = async () => {
seriesData.push(obj);
}
}
if (
!performanceCompletionAtWorkstationsChartRef.value ||
!performanceCompletionAtWorkstationsChartRef.value.commonChartRef
)
return;
performanceCompletionAtWorkstationsChartRef.value.commonChartRef.disposeEchartsByKey('chart-6');
performanceCompletionAtWorkstationsChartRef.value.commonChartRef.option = {
// color: ['#37a93d', '#de4231', '#808080'],
@@ -1053,7 +1062,11 @@ const initPerformanceCompletionAtDiscipline = async () => {
seriesData.push(obj);
}
}
if (
!performanceCompletionAtDisciplineChartRef.value ||
!performanceCompletionAtDisciplineChartRef.value.commonChartRef
)
return;
performanceCompletionAtDisciplineChartRef.value.commonChartRef.disposeEchartsByKey('chart-7');
performanceCompletionAtDisciplineChartRef.value.commonChartRef.option = {
// color: ['#37a93d', '#de4231', '#808080'],
@@ -1093,7 +1106,7 @@ const reviewPassedChartRef = ref();
const reviewPassedChartFormData = reactive<any>({
tag1: '',
tag2: '',
discipline: '',
});
const reviewPassedChangeFun = () => {
@@ -1106,16 +1119,7 @@ const initReviewPassed = async () => {
const seriesData: any = [];
const res: any = await getWorkstationReviewStatisticsApi({
resultTagType: 'tag5',
tag1: reviewPassedChartFormData.tag1,
tag2: reviewPassedChartFormData.tag2,
tag3: '',
tag4: '',
tag5: '',
tag6: '',
tag7: '',
tag8: '',
tag9: '',
tag10: '',
...reviewPassedChartFormData,
});
if (res && res.code === 200) {
xData =
@@ -1151,6 +1155,7 @@ const initReviewPassed = async () => {
seriesData.push(obj);
}
}
if (!reviewPassedChartRef.value || !reviewPassedChartRef.value.commonChartRef) return;
reviewPassedChartRef.value.commonChartRef.disposeEchartsByKey('chart-8');
reviewPassedChartRef.value.commonChartRef.option = {
// color: ['#808080', '#b6d634', '#37a93d', '#de4231'],
@@ -1306,6 +1311,8 @@ const initProjectTaskComplete = async () => {
// 项目uuids
// const params = {};
const { xData, seriesData, legendData } = await getProjectGroupTaskCompleteStatistics();
if (!projectTaskCompleteChartRef.value || !projectTaskCompleteChartRef.value.commonChartRef)
return;
projectTaskCompleteChartRef.value.commonChartRef.disposeEchartsByKey('chart-9');
const option = {
color: statusColorList,

10
src/views/simulation/creation/components/attributeConfig.vue
View File

@@ -309,7 +309,7 @@ const inputFormat = computed({
return props.nodeAttribute.inputFormat || '';
},
set(val) {
updateNodeAttribute({ inputFormat: val });
updateNodeAttribute({ inputFormat: base64ToStrFun(val) });
},
});
@@ -468,6 +468,14 @@ const openCodeDialogFun = (fileId: string) => {
const nodeListOptions = ref<any[]>([]);
const base64ToStrFun = (str: any) => {
const encoder = new TextEncoder();
const utfBytes = encoder.encode(str);
const binaryStr = String.fromCharCode(...utfBytes);
const base64Str = btoa(binaryStr);
return base64Str;
};
watch(
() => props.graph,
() => {

40
src/views/task/execution/components/runDetailPage/index.vue
View File

@@ -145,6 +145,13 @@
> -->
<el-button type="primary" @click="startLocalAppFun">执行</el-button>
<el-button type="primary" @click="continueStartRunJobFun">完成</el-button>
<el-button type="primary" @click="skipCurrentNodeFlowFun">跳过本地节点执行</el-button>
<el-button
type="primary"
@click="skipCurrentNodeFlowFun"
v-if="flowNodeParamData.value?.nodeTypeValue === '1'"
>跳过当前本地节点</el-button
>
</div>
<div class="tabs-info-content">
<!-- <paramSetting
@@ -326,7 +333,7 @@ import {
submittaskApi,
} from '@/api/application/application';
import { ElMessage } from 'element-plus';
import { continueServiceTaskApi } from '@/api/flowable/process';
import { asyncCallbackApi, continueServiceTaskApi } from '@/api/flowable/process';
import runStandard from './runPagecomponent/runStandard.vue';
import { RUN_STATUS } from '@/utils/enum/run';
import { addApplicationCallRecordApi } from '@/api/system/application';
@@ -378,6 +385,7 @@ const onlineFileParam = ref<any>({});
const changeCurrentFlowNodeFun = (info: any) => {
refreshPage.value = false;
const { node, data, process }: any = info;
console.log(info, 'info');
flowNode.value = node;
flowNodeData.value = data;
@@ -627,7 +635,7 @@ const startLocalAppFun = async () => {
if (uuid) {
const result: any = await checklocalresourceFun(appPath);
if (result === 'Success') {
if (result) {
const params = await getSubmitParamFun();
const res: any = await submittaskApi(params);
if (res) {
@@ -683,13 +691,13 @@ const getSubmitParamFun = async () => {
const { fileIds, fileNames, taskCmdParam }: any = await getNodeFileIdAndNames();
const fileType = await getfileTypeList();
const uploadId = flowNodeData.value.userParams.outputDirId;
const uploadId = flowNodeData.value.userParams.outputDirId.toString();
const owner = getUserData()?.nickname;
const tenantId = getUserTenantId();
const userId = getUserId();
const tenantId = getUserTenantId().toString();
const userId = getUserId().toString();
const localAppName = flowNodeParamData.value.label;
const localAppVersion = '';
const creatorId = getUserId();
const creatorId = getUserId().toString();
return {
runId,
@@ -730,7 +738,7 @@ const getNodeFileIdAndNames = async () => {
if (res && res.code === 200) {
const list = res.data.data;
for (let i = 0; i < list.length; i++) {
fileIds.push(list[i].id);
fileIds.push(list[i].id.toString());
fileNames.push(list[i].originalName);
}
@@ -766,6 +774,7 @@ const getfileTypeList = async () => {
const types: any = res.data.map((item: any) => {
const obj: any = {};
obj[item.dictName] = item.dictValue.split(',');
return obj;
});
return types;
} else {
@@ -898,6 +907,23 @@ const getDictionaryDataFun = async () => {
}
};
const skipCurrentNodeFlowFun = async () => {
const params = {
asyncTaskId: flowNodeData.value?.nodeDetailInfo.asyncTaskId,
resultJson: 'success',
status: 'SUCCESS',
};
try {
const res: any = await asyncCallbackApi(params);
if (res && res.code === 200) {
refreshFun();
}
} catch (error) {
console.log(error, 'error');
}
};
watch(
() => props.runInfo,
(newVal) => {

59
src/views/task/projectDetail/components/statisticAnalysis.vue
View File

@@ -468,7 +468,7 @@ const queryUserTaskCompletion = async () => {
},
grid: {
top: '10%',
bottom: '10%',
bottom: '50',
left: '5%',
right: '5%',
},
@@ -480,27 +480,7 @@ const queryUserTaskCompletion = async () => {
type: 'value',
minInterval: 1,
},
dataZoom:
xData.length > 4
? [
{
type: 'slider',
show: true,
xAxisIndex: [0],
start: 0,
end: 100,
textStyle: {
color: 'transparent',
},
maxValueSpan: 4,
minValueSpan: 4,
moveHandleSize: 10,
height: 0,
filterMode: 'empty',
bottom: 15,
},
]
: null,
dataZoom: xData.length > 5 ? [] : null,
series: seriesData,
};
userTaskCompleteChartRef.value.commonChartRef.initChart();
@@ -583,7 +563,7 @@ const queryUserDifficultStatistics = async () => {
},
grid: {
top: '10%',
bottom: '10%',
bottom: '50',
left: '5%',
right: '5%',
},
@@ -595,27 +575,7 @@ const queryUserDifficultStatistics = async () => {
type: 'value',
minInterval: 1,
},
dataZoom:
xData.length > 4
? [
{
type: 'slider',
show: true,
xAxisIndex: [0],
start: 0,
end: 100,
textStyle: {
color: 'transparent',
},
maxValueSpan: 4,
minValueSpan: 4,
moveHandleSize: 10,
height: 0,
filterMode: 'empty',
bottom: 15,
},
]
: null,
dataZoom: xData.length > 5 ? [] : null,
// series: seriesData,
series: sortObjectArray(seriesData, 'name'),
};
@@ -963,6 +923,11 @@ const queryPerfCompletionByWorkspace = async () => {
seriesData.push(obj);
}
}
if (
!performanceCompletionAtWorkstationsChartRef.value ||
!performanceCompletionAtWorkstationsChartRef.value.commonChartRef
)
return;
performanceCompletionAtWorkstationsChartRef.value.commonChartRef.disposeEchartsByKey('chart-6');
performanceCompletionAtWorkstationsChartRef.value.commonChartRef.option = {
// color: ['#808080', '#de4231', '#37a93d'],
@@ -1164,7 +1129,11 @@ const queryPerfCompletionByDiscipline = async () => {
seriesData.push(obj);
}
}
if (
!performanceCompletionAtDisciplineChartRef.value ||
!performanceCompletionAtDisciplineChartRef.value.commonChartRef
)
return;
performanceCompletionAtDisciplineChartRef.value.commonChartRef.disposeEchartsByKey('chart-7');
performanceCompletionAtDisciplineChartRef.value.commonChartRef.option = {
// color: ['#808080', '#de4231', '#37a93d'],