diff --git a/src/api/flow/index.js b/src/api/flow/index.js
index 8fd5802..b11f65b 100644
--- a/src/api/flow/index.js
+++ b/src/api/flow/index.js
@@ -13,8 +13,32 @@ const groupByUnit=(projectId,deptId)=> {
method: 'get'
})
}
+const listByUnit=(projectId,deptId,unit,pageNum,pageSize)=>{
+ return request({
+ url: `bgscreen/flow/listByUnit?pageNum=${pageNum}&pageSize=${pageSize}`,
+ method: 'post',
+ data:{
+ taskId:unit,
+ deptId:deptId,
+ projectId:projectId
+ }
+ })
+}
+const listByState=(projectId,deptId,state,pageNum,pageSize)=>{
+ return request({
+ url: `bgscreen/flow/listByState?pageNum=${pageNum}&pageSize=${pageSize}`,
+ method: 'post',
+ data:{
+ taskId:state,
+ deptId:deptId,
+ projectId:projectId
+ }
+ })
+}
export default{
groupByCategory,
- groupByUnit
+ groupByUnit,
+ listByUnit,
+ listByState
}
diff --git a/src/pages/components/AttendanceDetailDialog.vue b/src/pages/components/AttendanceDetailDialog.vue
index b99d8fa..f59b0af 100644
--- a/src/pages/components/AttendanceDetailDialog.vue
+++ b/src/pages/components/AttendanceDetailDialog.vue
@@ -33,7 +33,7 @@
-
+
@@ -61,12 +61,7 @@ export default {
},
mounted() {
- this.tableData = [
- { prj: '项目一', node: '招采', days: 5, date: '2023.06.04',username:'haha' },
- { prj: '项目二', node: '报建审批及地勘施工', days: 10, date: '2023.05.31' },
- { prj: '项目三', node: '前期工作', days: 3, date: '2023.06.06' },
- { prj: '项目四', node: '市政道路施工', days: 4, date: '2023.06.05' }
- ]
+
},
methods: {
diff --git a/src/pages/engin/flowDetailByStateDialog.vue b/src/pages/engin/flowDetailByStateDialog.vue
new file mode 100644
index 0000000..3e1c371
--- /dev/null
+++ b/src/pages/engin/flowDetailByStateDialog.vue
@@ -0,0 +1,105 @@
+
+
+ 质量-审批进度
+
+
+
+
+
+
+
+
+
+
+
+
+ 已完成
+ 进行中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/engin/flowDetailByUnitDialog.vue b/src/pages/engin/flowDetailByUnitDialog.vue
new file mode 100644
index 0000000..d2e2787
--- /dev/null
+++ b/src/pages/engin/flowDetailByUnitDialog.vue
@@ -0,0 +1,101 @@
+
+
+ 待审批
+
+
总包单位
+
监理单位
+
设计单位
+
甲方代表
+
子公司
+
+
+
+
+
+
+
+
+
+
+
+ 已完成
+ 进行中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue
index 3e0bc79..d5a8241 100644
--- a/src/pages/projectEngin.vue
+++ b/src/pages/projectEngin.vue
@@ -32,10 +32,12 @@
-
+
+
-
+
+
@@ -74,6 +76,8 @@
+
+
@@ -87,11 +91,13 @@ import '../components/project-overview-chart'
import BorderBox6 from './components/BorderBox6.vue'
import debounce from 'lodash.debounce'
import imageItem from './engin/enginImageItems.vue'
+import unitDialog from './engin/flowDetailByUnitDialog.vue'
+import stateDialog from './engin/flowDetailByStateDialog.vue'
export default {
name: 'JhbigscreenProjectEngin',
components: {
BorderBox6,
- imageItem
+ imageItem,unitDialog,stateDialog
},
data() {
return {
@@ -160,6 +166,18 @@ export default {
},
methods: {
+ doStateDlg(){
+ this.$refs.stateDlg.showDialog({
+ deptId:this.dept?.id||0,
+ projectId:this.project?.id||0
+ });
+ },
+ doUnitDlg(){
+ this.$refs.unitDlg.showDialog({
+ deptId:this.dept?.id||0,
+ projectId:this.project?.id||0
+ });
+ },
loadPeriodical(){
this.$api.periodical.getList().then(d=>{
this.periodicalList=(d.data||[]).map(it=>{
@@ -171,9 +189,6 @@ export default {
});
},
changeChart1(opt){
- console.log("--opt->",opt)
- //opt.xAxis.axisLabel={width:50}
- //opt.xAxis.data=this.chartInfo;
return opt;
},
changeChart2(opt){
diff --git a/src/pages/style/index.less b/src/pages/style/index.less
index 2b7c3e1..7322c67 100644
--- a/src/pages/style/index.less
+++ b/src/pages/style/index.less
@@ -118,6 +118,9 @@
.btn-next{
margin-left:20px;
}
+ .el-pagination__total{
+ color: #fff;
+ }
.el-pager {
li{
background-color: rgba(1, 169, 255,0.4);