Browse Source

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

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

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

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

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

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

Loading…
Cancel
Save