diff --git a/.env.development b/.env.development index de82b93..acdc7f0 100644 --- a/.env.development +++ b/.env.development @@ -5,6 +5,7 @@ ENV = 'development' # 许镇-本地服地址 VUE_APP_BASE_API = 'http://192.168.99.72:11100' VUE_APP_AIDEEPSEEK_API = 'http://192.168.99.86:12123' +VUE_APP_PROCESSMODEL_API = 'http://192.168.99.72:11200' # VUE_APP_BASE_API = 'http://192.168.99.71:11110' # VUE_APP_BASE_API = 'http://192.168.99.107:11100' diff --git a/.env.production b/.env.production index 17af5ef..87b5e11 100644 --- a/.env.production +++ b/.env.production @@ -4,6 +4,7 @@ ENV = 'production' # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http # VUE_APP_BASE_API = 'http://192.168.99.107:11100' VUE_APP_AIDEEPSEEK_API = 'http://192.168.99.86:12123' +VUE_APP_PROCESSMODEL_API = 'http://192.168.99.72:11200' # VUE_APP_BASE_API = 'http://27.19.215.77:11100' # VUE_APP_BASE_API = 'http://27.16.212.58:11100' VUE_APP_BASE_API = 'http://192.168.99.71:11110' diff --git a/public/static/config.js b/public/static/config.js index 835f952..dfad4ff 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -4,9 +4,5 @@ window.g = { ApiUrl: 'http://192.168.99.71:11110', // ApiUrl: 'http://192.168.99.107:11100', AIDeepSeekUrl:'http://192.168.99.86:12123', - // ParentPage: { // 后续看需求配置 - // CrossDomainProxyUrl: '/Home/CrossDomainProxy', - // BtnsApi: '/api/services/app/Authorization/GetBtns', - // OrgsApi: '/api/services/app/authorization/GetOrgsByUserId' - // }, + ProcessModelUrl:'http://192.168.99.72:11200', } \ No newline at end of file diff --git a/src/views/archiveUtilize/archiveSearch/module/resultList.vue b/src/views/archiveUtilize/archiveSearch/module/resultList.vue index 9a5438d..825285c 100644 --- a/src/views/archiveUtilize/archiveSearch/module/resultList.vue +++ b/src/views/archiveUtilize/archiveSearch/module/resultList.vue @@ -97,8 +97,8 @@ /> -->
- - 搜索 + + 搜索
高级检索 @@ -322,8 +322,12 @@ export default { return highlightedText } }, - handledResultSearch() { + handledResultSearch(type) { if (this.searchkeywords) { + if (type === 'search') { + this.page.page = 1 + } + console.log('this.page.page', this.page.page) this.$emit('common-search') this.resultData = [] this.resultLoading = true @@ -421,7 +425,7 @@ export default { this.fondsKeys = checkedKeys.map(item => item.fondsId) } if (this.isCommon) { - this.handledResultSearch() + this.handledResultSearch('search') } else { this.getSeniorSearch() } @@ -435,7 +439,7 @@ export default { } this.getArchiveCtgNo(this.categoryKeys) if (this.isCommon) { - this.handledResultSearch() + this.handledResultSearch('search') } else { this.getSeniorSearch() } @@ -461,7 +465,7 @@ export default { this.classifysKeys = checkedKeys.map(item => item.code) } if (this.isCommon) { - this.handledResultSearch() + this.handledResultSearch('search') } else { this.getSeniorSearch() } @@ -474,7 +478,7 @@ export default { this.levelsKeys = checkedKeys.map(item => item.value) } if (this.isCommon) { - this.handledResultSearch() + this.handledResultSearch('search') } else { this.getSeniorSearch() } @@ -559,11 +563,11 @@ export default { handleSizeChange(size) { this.page.size = size this.page.page = 1 - this.handledResultSearch() + this.handledResultSearch('page') }, handleCurrentPage(val) { this.page.page = val - this.handledResultSearch() + this.handledResultSearch('page') }, closeDialog() { @@ -728,6 +732,9 @@ export default { background-color: #CAE1FF; color: #0348F3; } + p{ + max-width: 1050px; + } } .result-item-content{ overflow: hidden; diff --git a/src/views/system/archivesCategory/processManage/index.vue b/src/views/system/archivesCategory/processManage/index.vue index 19d93c0..6de5926 100644 --- a/src/views/system/archivesCategory/processManage/index.vue +++ b/src/views/system/archivesCategory/processManage/index.vue @@ -97,6 +97,7 @@ export default { this.$nextTick(() => { this.$refs.cuform.cuDialogVisible = true this.$refs.cuform.setPocessCurrent = item + this.$refs.cuform.getEditInfoFlow = this.editInfoFlow this.$refs.cuform.handleEditInfoFlow(this.editInfoFlow) }) }).catch(err => { diff --git a/src/views/system/archivesCategory/processManage/module/form.vue b/src/views/system/archivesCategory/processManage/module/form.vue index b9c97e2..64c6549 100644 --- a/src/views/system/archivesCategory/processManage/module/form.vue +++ b/src/views/system/archivesCategory/processManage/module/form.vue @@ -98,7 +98,8 @@ export default { userTableData: [], taskList: [], selectFlowVal: null, - setPocessCurrent: null + setPocessCurrent: null, + getEditInfoFlow: {} } }, computed: { @@ -126,6 +127,7 @@ export default { }, methods: { handleEditInfoFlow(newVal) { + console.log('getEditInfoFlow', this.getEditInfoFlow) const findItem = this.findIdByModelId(newVal.flowId) this.form.model = findItem this.selectModel(findItem, newVal) @@ -146,6 +148,10 @@ export default { }) }, selectModel(val, parentProcessVal) { + if (!parentProcessVal) { + this.getEditInfoFlow.categoryFlowDetails = [] + } + this.selectFlowVal = val this.loadingImg = true FetchFindFolwImgByModelId({ 'processDefinitionId': val.procdefId }).then((res) => { @@ -205,7 +211,7 @@ export default { if (valid) { const detailsDTOs = this.taskList.map((item, index) => { const json = {} - json.id = this.editInfoFlow && this.editInfoFlow.categoryFlowDetails.length !== 0 ? this.editInfoFlow.categoryFlowDetails[index].id : null + json.id = this.getEditInfoFlow && this.getEditInfoFlow.categoryFlowDetails.length !== 0 ? this.getEditInfoFlow.categoryFlowDetails[index].id : null json.postId = item.postId json.taskId = item.nodeId return json @@ -217,9 +223,10 @@ export default { 'flowName': this.selectFlowVal.deployName, 'flowKey': this.selectFlowVal.modelKey, 'flowManageId': this.setPocessCurrent.id, - 'id': this.editInfoFlow && this.editInfoFlow.id, - 'status': this.editInfoFlow && this.editInfoFlow.status + 'id': this.getEditInfoFlow && this.getEditInfoFlow.id, + 'status': this.getEditInfoFlow && this.getEditInfoFlow.status } + console.log('params', params) FetchFlowbinding(params).then((res) => { if (res === 'SUCCESS') { this.$message({ message: '操作成功', type: 'success', offset: 8 }) diff --git a/src/views/system/processManage/modelDesign/index.vue b/src/views/system/processManage/modelDesign/index.vue index 884575c..ad35157 100644 --- a/src/views/system/processManage/modelDesign/index.vue +++ b/src/views/system/processManage/modelDesign/index.vue @@ -1,15 +1,15 @@