jiezhoufg/apaas-custom-mydemo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
大黑 2026-01-22 09:33:32 +08:00
parent d53901e00a
commit 501742b95a
6 changed files with 135 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/demo/activiti.js
View File

@ -11,7 +11,7 @@ export default {
url: '/custom/activiti/handleApproval',
method: 'post'
},
//撤回
// 撤回
RETURN_ENGINE_CHECK: {
url: '/custom/activiti/returnApproval',
method: 'get'

32
src/api/demo/index.js
View File

@ -19,28 +19,28 @@ export default {
method: 'get'
},
//测试文件上传
// 测试文件上传
TEST_FILE_UPLOAD: {
url: '/custom/benchmark/uploadFile',
method: 'post'
},
//获取用户列表
// 获取用户列表
SELECT_USER_BY_DEPT: {
url: '/custom/responsible/getUserByDepartmentId',
method: 'get'
},
//保存责任管理
// 保存责任管理
SAVE_MANAGER_DATA: {
url: '/custom/responsible/saveResponsiblePerson',
method: 'post'
},
//判断是否是责任人
// 判断是否是责任人
IS_RESPONSIBLE: {
url: '/custom/responsible/isResponsiblePerson',
method: 'get'
},
//获取责任人
// 获取责任人
GET_MANAGER_DATA: {
url: '/custom/responsible/getDeptResponsible',
method: 'get'
@ -53,7 +53,7 @@ export default {
url: '/custom/responsible/deleteResponsiblePerson',
method: 'get'
},
//新增填写人管理
// 新增填写人管理
SAVE_FILLER_DATA: {
url: '/custom/responsible/saveFilledPerson',
method: 'post'
@ -66,12 +66,12 @@ export default {
url: '/custom/responsible/getAllSubsystem',
method: 'get'
},
//判断是否是填写人
// 判断是否是填写人
IS_FILLER: {
url: '/custom/filler/isFillerPerson',
method: 'get'
},
//获取填写人
// 获取填写人
GET_FILLER_DATA: {
url: '/custom/responsible/getDeptFilled',
method: 'get'
@ -106,7 +106,7 @@ export default {
url: '/custom/common/insertModelCommon',
method: 'post'
},
//填写人退回
// 填写人退回
HANDLE_FILLER_BACK: {
url: '/custom/todoTaskPojo/todoReturn',
method: 'post'
@ -115,37 +115,37 @@ export default {
url: '/custom/engineParamDetailPojo/selectParamList',
method: 'get'
},
//获取待办列表
// 获取待办列表
GET_TODO_LIST: {
url: '/custom/todoTaskPojo/selectByresPersonTodoPage',
method: 'post'
},
//获取创建人待办
// 获取创建人待办
GET_TODO_LIST_BY_CREATOR: {
url: '/custom/todoTaskPojo/selectByPage',
method: 'post'
},
//更新参数
// 更新参数
UPDATE_PARAM: {
url: '/custom/engineParamDetailPojo/updateParamValue?userID=',
method: 'post'
},
//导出模板
// 导出模板
EXPORT_TEMPLATE: {
url: '/custom/engineParamDetailPojo/excelExport',
method: 'get'
},
//导入
// 导入
IMPORT_ENGINE_MODEL: {
url: '/custom/engineParamDetailPojo/excelImport',
method: 'post'
},
//责任人分发
// 责任人分发
HANDLE_RESPONSIBLE_DISPATCH: {
url: '/custom/engineParamDetailPojo/updateToInsertFiledBy?userID=',
method: 'post'
},
//分发给责任人
// 分发给责任人
HANDLE_TODO_DISPATCH: {
url: '/custom/todoTaskPojo/createResPerson?userID=',
method: 'post'

31
src/api/demo/model.js
View File

@ -1,30 +1,30 @@
export default {
//添加模板
// 添加模板
ADD_MODEL: {
url: '/custom/template/insertTemplate',
method: 'post'
},
//模板管理列表
// 模板管理列表
GET_MODEL_LIST: {
url: '/custom/template/getTemplateByCondition',
method: 'get'
},
//导入模板
// 导入模板
IMPORT_MODEL: {
url: '/custom/template/import',
method: 'post'
},
//修改模板
// 修改模板
EDIT_MODEL: {
url: '/custom/template/updateTemplate',
method: 'post'
},
//查看版本
// 查看版本
CHECK_MODEL_VERISON: {
url: '/custom/template/getTemplateVersion',
method: 'get'
},
//下载
// 下载
DOWNLODE_MODEL: {
url: '/custom/template/export',
method: 'get'
@ -33,22 +33,22 @@ export default {
url: '/custom/template/exportMultiple',
method: 'get'
},
//获取部门
// 获取部门
GET_DEPARTMENT: {
url: '/custom/template/getDept',
method: 'get'
},
//查询详情
// 查询详情
GET_MODEL_DETAIL: {
url: '/custom/parameter/getParameterByCondition',
method: 'get'
},
//添加参数
// 添加参数
ADD_MODEL_PARAM: {
url: '/custom/parameter/insertParameter',
method: 'post'
},
//维护参数
// 维护参数
EDIT_MODEL_PARAM: {
url: '/custom/parameter/maintenanceParameters',
method: 'post'
@ -69,21 +69,22 @@ export default {
url: '/custom/approval/handleApproval',
method: 'post'
},
//获取审批详情
// 获取审批详情
// GET_APPROVAL_DETAIL: {
// url: '/custom/approval/getApprovalDetail',
// method: 'get'
// },
//获取所有人
// 获取所有人
GET_ALLUSERS: {
url: '/custom/approval/getUsersByCondition',
method: 'get'
},
//获取审批变更
// 获取审批变更
GET_APPROVAL_CHANGE: {
url: '/custom/approval/getTemplateChanges',
method: 'get'
}, //获取审批所有
},
// 获取审批所有
GET_PPROVAL_ALL: {
url: '/custom/approval/getApprovalProcess',
method: 'get'
@ -92,7 +93,7 @@ export default {
url: '/custom/responsible/getSubDepartmentById',
method: 'get'
},
//处理模板审批撤回
// 处理模板审批撤回
RETURN_APPROVAL: {
url: '/custom/approval/handleReturn',
method: 'post'

1
src/custom/apaas-custom-mydemo/custom-page/approvalProgressDetail.vue
View File

@ -1557,7 +1557,6 @@ export default {
}
}
}
}
.return-opinion-section {

23
src/custom/apaas-custom-mydemo/custom-page/checkData.vue
View File

@ -770,7 +770,16 @@ export default {
// 新增的图表展示在第一个
this.chartList.unshift(newChart)
this.$nextTick(() => {
// 优先初始化新加的图表
this.initChart(0)
// 如果存在其他未初始化的图表，补充初始化一次，避免索引变动导致未挂载
this.$nextTick(() => {
this.chartList.forEach((chart, idx) => {
if (!chart.chartInstance) {
this.initChart(idx)
}
})
})
})
},
toggleFloatingPanel() {
@ -799,6 +808,14 @@ export default {
chart.chartInstance = null
}
this.chartList.splice(index, 1)
// 删除后重新检查剩余图表的初始化状态
this.$nextTick(() => {
this.chartList.forEach((c, idx) => {
if (c && !c.chartInstance) {
this.initChart(idx)
}
})
})
},
handleClearAllCharts() {
this.disposeAllCharts()
@ -1269,8 +1286,12 @@ export default {
// 保存新选择的机型信息，用于后续查询
chart.newSelectedModels = newSelectedModels
// 先触发查询，再关闭弹窗，避免 currentChartIndex 被重置
const chartIndex = this.currentChartIndex
if (chartIndex >= 0) {
this.handleChartModelQuery(chartIndex)
}
this.handleAddModelDialogClose()
this.handleChartModelQuery(this.currentChartIndex)
},
// 图表机型查询
handleChartModelQuery(index) {

51
src/custom/apaas-custom-mydemo/custom-page/model-query.vue
View File

@ -20,10 +20,14 @@
/>
</el-select>
<el-button class="update-favorite-button" @click="handleUpdateFavorite"
>更新常用</el-button
>
更新常用
</el-button
>
<el-button type="primary" class="add-favorite-button" @click="handleAddFavorite"
>新增常用</el-button
>
新增常用
</el-button
>
<el-button class="hidden-params-button" @click="handleShowHiddenParams">
已隐藏参数
@ -44,8 +48,12 @@
<div class="left-param-panel">
<div class="tree-search-header">
<el-radio-group v-model="treeSearchMode" size="mini" class="search-mode-switch">
<el-radio-button label="subsystem">子系统</el-radio-button>
<el-radio-button label="parts">零部件名称</el-radio-button>
<el-radio-button label="subsystem">
子系统
</el-radio-button>
<el-radio-button label="parts">
零部件名称
</el-radio-button>
</el-radio-group>
</div>
<el-input
@ -78,13 +86,21 @@
<table class="comparison-table">
<thead>
<tr>
<th class="subsystem-column">子系统名称</th>
<th class="parts-column">零部件名称</th>
<th class="param-column">参数名称</th>
<th class="subsystem-column">
子系统名称
</th>
<th class="parts-column">
零部件名称
</th>
<th class="param-column">
参数名称
</th>
<th v-for="(model, index) in comparisonModels" :key="index" class="model-column">
<div class="model-header">
<div v-if="model.name" class="model-name"
>{{ model.name }} V{{ model.parameterVersion }}</div
>
{{ model.name }} V{{ model.parameterVersion }}
</div
>
<i
v-if="model.name"
@ -107,8 +123,12 @@
</thead>
<tbody>
<tr v-for="(param, paramIndex) in displayParams" :key="paramIndex">
<td class="subsystem-column">{{ param.subsystemName }}</td>
<td class="parts-column">{{ param.displayPartsName }}</td>
<td class="subsystem-column">
{{ param.subsystemName }}
</td>
<td class="parts-column">
{{ param.displayPartsName }}
</td>
<td class="param-column">
<span class="param-name">{{ getParamDisplayName(param) }}</span>
<i
@ -157,7 +177,8 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="modelName" label="产品型号" min-width="150" />
<el-table-column prop="parameterVersion" label="版本" min-width="70"
><template slot-scope="scope">
>
<template slot-scope="scope">
<span>V{{ scope.row.parameterVersion }}</span>
</template>
</el-table-column>
@ -220,7 +241,9 @@
</template>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="handleHiddenParamsDialogClose">取消</el-button>
<el-button @click="handleHiddenParamsDialogClose">
取消
</el-button>
<el-button
type="primary"
:disabled="selectedParamsToRestore.length === 0"
@ -255,7 +278,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="handleAddFavoriteDialogClose">取消</el-button>
<el-button @click="handleAddFavoriteDialogClose">
取消
</el-button>
<el-button type="primary" :loading="savingFavorite" @click="handleConfirmAddFavorite">
确定
</el-button>