odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 修复流程图渲染问题' (#218) from dj into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/218
This commit is contained in:
odjbin
2024-05-20 16:15:50 +00:00
parent 1635482e09 9f4fe95e4d
commit 39b1690c0a
7 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/DetailComponent/ApprovalDetail.vue
View File

@@ -21,7 +21,7 @@
<div class="process">
<operation-render v-if="processViewer" :operation-list="data.operationList"
:state="data.state"/>
<process-diagram-viewer v-if="processViewer"/>
<process-diagram-viewer v-if="processViewer" :id-name="type"/>
</div>
</div>
<Opinion: v-if="data.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
@@ -91,8 +91,8 @@ const schema = computed(()=>{
component: ()=>(
<div>
{
props.formData.singleFile?.originalFileName ?
<span
props.formData.singleFile?.originalFileName ?
<span
style={{color: '#409EFF', cursor: 'pointer'}}
onClick={()=>handleDownload(props.formData.singleFile)}
>
@@ -101,7 +101,7 @@ const schema = computed(()=>{
<span>{'--'}</span>
}
</div>
)
},
]
@@ -155,4 +155,4 @@ watchEffect(()=>{
<style lang="scss" scoped>
</style>
</style>

2
src/components/DetailComponent/CollectionDetail.vue
View File

@@ -61,7 +61,7 @@
<div class="process">
<operation-render v-if="processViewer" :operation-list="data.operationList"
:state="data.state"/>
<process-diagram-viewer v-if="processViewer"/>
<process-diagram-viewer v-if="processViewer" id-name="collectionProcess"/>
</div>
</div>
</el-form>

2
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -158,7 +158,7 @@
<div class="process">
<operation-render v-if="processViewer" :operation-list="data.operationList"
:state="data.state"/>
<process-diagram-viewer v-if="processViewer"/>
<process-diagram-viewer v-if="processViewer" id-name="summaryProcess"/>
</div>
</div>
<div class="oper-page-btn" v-if="data.state === '1' && data.taskId">

9
src/views/project-demand/summary/detail.vue
View File

@@ -5,8 +5,11 @@
:processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/>
<summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
:processViewer="summaryProcessViewer" :loading="loading"/>
<ApprovalDetail v-show="showActive == '20'" :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"></ApprovalDetail>
</template>
</steps>
<opinion v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"></opinion>
</template>
<script setup lang="jsx">
@@ -19,6 +22,7 @@ import {ElNotification} from "element-plus";
const route = useRoute()
const companyOption = ref([])
const commonForm = ref({})
const summaryData = ref({})
const summaryProcessViewer = ref(true)
const loading = ref(false)
@@ -31,7 +35,9 @@ const getCompanyOption = async () => {
}
const getInfo = async (state) => {
const projectId = route.query.projectId
await getCompanyOption()
if(showActive == '00'){
await getCompanyOption()
}
summaryProcessViewer.value = false
loading.value = true
const {code, data,msg} = await getMapProjectStateInfo(projectId, state)
@@ -43,6 +49,7 @@ const getInfo = async (state) => {
if(code===1000){
summaryData.value = data;
loading.value = false
console.log('data-====================',data)
processStore.setDesign(data)
processStore.runningList.value = data.runningList;
processStore.endList.value = data.endList;

11
src/views/project-management/implementation/detail.vue
View File

@@ -1,8 +1,8 @@
<template>
<steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
<template #content>
<collection-detail
:formData="collectionData.formData"
<collection-detail
:formData="collectionData.formData"
:data="collectionData"
:processViewer="commonProvessViewer"
:companyOption="companyOption"
@@ -12,10 +12,10 @@
<summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" :processViewer="commonProvessViewer"/>
<ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
<ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
</template>
</steps>
<Opinion: v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
<opinion v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"/>
</template>
<script setup lang="jsx">
@@ -27,6 +27,7 @@ import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
import { getMapProjectStateInfo } from '@/components/steps/api';
import { ElLoading } from "element-plus";
import Opinion from "@/components/DetailComponent/Opinion.vue";
// const activeName = ref('first')
const handleClick = (tab, event) => {
@@ -83,7 +84,7 @@ const getAllInfo = async (state) => {
} catch {
loading.close()
}
}
const showActive = ref()

30
src/views/project-management/initiation/detail.vue
View File

@@ -1,27 +1,8 @@
<template>
<!-- <div class="detail-block">
<el-tabs
v-model="activeName"
type="card"
class="demo-tabs"
@tab-click="handleClick"
>
<el-tab-pane label="需求征集" name="first">
<collection-detail :formData="collectionData.formData" :data="collectionData"
:processViewer="collectionProcessViewer"
:companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
</el-tab-pane>
<el-tab-pane label="需求上报" name="second">
<summary-detail :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"/>
</el-tab-pane>
<el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
</el-tabs>
</div> -->
<steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
<template #content>
<collection-detail
:formData="collectionData.formData"
<collection-detail
:formData="collectionData.formData"
:data="collectionData"
:processViewer="commonProvessViewer"
:companyOption="companyOption"
@@ -30,10 +11,10 @@
/>
<summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" :processViewer="commonProvessViewer"/>
<ApprovalDetail v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
</template>
</steps>
<Opinion: v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
<opinion v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"/>
</template>
<script setup lang="jsx">
@@ -46,6 +27,7 @@ import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
import { getMapProjectStateInfo } from '@/components/steps/api';
import { ElLoading } from "element-plus";
import Opinion from "@/components/DetailComponent/Opinion.vue";
const route = useRoute()
const activeName = ref('first')
@@ -140,7 +122,7 @@ const getAllInfo = async (state) => {
} catch {
loading.close()
}
}
const showActive = ref()

7
src/views/workflow/common/ProcessDiagramViewer.vue
View File

@@ -8,8 +8,8 @@
</div>
<div style="margin-top: 40px">
<div :style="'transform: scale('+ scale / 100 +');'">
<div id="previewProcess">
<process-tree :mode="mode" ref="processTreePreview" id-name="previewProcess"/>
<div :id="idName">
<process-tree :mode="mode" ref="processTreePreview" :id-name="idName"/>
</div>
</div>
</div>
@@ -24,6 +24,9 @@ const props = defineProps({
mode: {
type: String,
default: 'preview'
},idName:{
type:String,
default:'previewProcess'
}
})