diff --git a/src/api/engin.js b/src/api/engin.js index fa64ab7..7b027d8 100644 --- a/src/api/engin.js +++ b/src/api/engin.js @@ -6,6 +6,13 @@ const magList=()=>{ method:'get' }) } +const magDetailList=(data)=>{ + return request({ + url:'base/magDetail/list', + method:'get', + params:data + }) +} const magGroupByTopic=()=>{ return new Promise((resolve) => { request({ @@ -14,8 +21,9 @@ const magGroupByTopic=()=>{ }).then(d=>{ let total=0; let tmps=(d.data||[]).map(it=>{ - total+=it.id||0; + total+=it.id||0; return { + magid:it.magid, mag:it.title, magOrd:it.ord, magDate:+dayjs(it.createTime).$d, @@ -30,6 +38,7 @@ const magGroupByTopic=()=>{ let obj={}; if(objs.length==0){ obj={ + magid:it.magid, mag:it.mag, ord:it.magOrd, date:it.magDate, @@ -121,5 +130,6 @@ export default { groupByMag, committeeList, committeeSumGroupByType, - selectByWorkingType + selectByWorkingType, + magDetailList } \ No newline at end of file diff --git a/src/pages/engin/magListDialog.vue b/src/pages/engin/magListDialog.vue new file mode 100644 index 0000000..9eab7f5 --- /dev/null +++ b/src/pages/engin/magListDialog.vue @@ -0,0 +1,150 @@ + + + + + + \ No newline at end of file diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index 3c79c35..321b54a 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -78,7 +78,7 @@ @@ -182,6 +182,7 @@ + @@ -191,6 +192,7 @@ import '../components/module/module-one-2-1' import '../components/module/module-one-3-1' import '../components/staff-survey-chart' import '../components/chart-bar' +import magListDialog from './engin/magListDialog.vue' import BorderBox6 from './components/BorderBox6.vue' import debounce from 'lodash.debounce' import imageItem from './engin/enginImageItems.vue' @@ -202,7 +204,7 @@ import { tryToJson } from '@/utils/tools' import ListByCategory from './engin/flowListByCategory.vue' export default { name: 'JhbigscreenProjectEngin', - components: { BorderBox6, imageItem, unitDialog, stateDialog, enginChart, projectStandardDialog, ListByCategory }, + components: { BorderBox6, imageItem, unitDialog, stateDialog, enginChart, projectStandardDialog, ListByCategory,magListDialog }, data() { return { label1: '项目标准化管理', @@ -263,6 +265,9 @@ export default { }); }, methods: { + showMagDlg(row,idx){ + this.$refs.magListDlg.showDialog({row:row,idx:idx}); + }, getCommList(it){ this.selType=it.value; this.$api.engin.selectByWorkingType({ @@ -438,7 +443,7 @@ export default { left: 196px; } } - + /deep/ .tr-cmd { cursor: pointer;