Browse Source

fix 单一数据源获取项目信息

dev
巴林闲侠 2 years ago
parent
commit
c561472a38
  1. 8
      api/app/lib/controllers/workOrder/index.js
  2. 1
      web/client/src/components/workflow/index.jsx

8
api/app/lib/controllers/workOrder/index.js

@ -38,8 +38,8 @@ async function basicDataAllProject (ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs const { clickHouse } = ctx.app.fs
const proRes = await models.ProjectCorrelation.findAndCountAll({ const proRes = await models.ProjectCorrelation.findAll({
where: { where: {
del: false, del: false,
}, },
@ -65,8 +65,8 @@ async function basicDataAllProject (ctx) {
` `
).toPromise() || [] : ).toPromise() || [] :
[] []
console.log('pepProjectRes', pepProjectRes);
const list = proRes.map(p => { const list = proRes.map(p => {
const corPro = pepProjectRes.find(pp => pp.id == p.pepProjectId) || {} const corPro = pepProjectRes.find(pp => pp.id == p.pepProjectId) || {}
return { return {
value: p.id, value: p.id,

1
web/client/src/components/workflow/index.jsx

@ -150,7 +150,6 @@ const WorkFlowModal = (props) => {
allowTransparency="true" allowTransparency="true"
ref={iframeRef} ref={iframeRef}
src={`${webEmis}/process/${processId}/apply?token=${user.token}`} src={`${webEmis}/process/${processId}/apply?token=${user.token}`}
// src={`${webEmis}/process/${processId}/apply?token=${user.token}`}
width={'100%'} width={'100%'}
style={{ height: '100vh' }} style={{ height: '100vh' }}
frameBorder="0" frameBorder="0"

Loading…
Cancel
Save