diff --git a/src/api/flow/index.js b/src/api/flow/index.js
index 77a71dd..e9edb4f 100644
--- a/src/api/flow/index.js
+++ b/src/api/flow/index.js
@@ -47,6 +47,17 @@ const listByUnit=(projectId,deptId,unit,pageNum,pageSize)=>{
}
})
}
+const listByCategory=(projectId,deptId,category,pageNum,pageSize)=>{
+ return request({
+ url: `bgscreen/flow/listByCategory?pageNum=${pageNum}&pageSize=${pageSize}`,
+ method: 'post',
+ data:{
+ category:category,
+ deptId:deptId,
+ projectId:projectId
+ }
+ })
+}
const listByState=(projectId,deptId,state,pageNum,pageSize)=>{
return request({
url: `bgscreen/flow/listByState?pageNum=${pageNum}&pageSize=${pageSize}`,
@@ -83,5 +94,6 @@ export default{
listByState,
groupByProject,
findSafetyWorkList,
- findFormDatasByProcInsId
+ findFormDatasByProcInsId,
+ listByCategory
}
diff --git a/src/pages/engin/flowListByCategory.vue b/src/pages/engin/flowListByCategory.vue
new file mode 100644
index 0000000..c9aa9b3
--- /dev/null
+++ b/src/pages/engin/flowListByCategory.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+ 已完成
+ 进行中
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue
index fec0c92..cb8a0c1 100644
--- a/src/pages/projectEngin.vue
+++ b/src/pages/projectEngin.vue
@@ -67,6 +67,10 @@
+
+
+
+
@@ -98,9 +103,10 @@ import stateDialog from './engin/flowDetailByStateDialog.vue'
import projectStandardDialog from './engin/projectStandardDialog.vue'
import enginChart from './engin/enginChart.vue'
import { tryToJson } from '@/utils/tools'
+import ListByCategory from './engin/flowListByCategory.vue'
export default {
name: 'JhbigscreenProjectEngin',
- components: {BorderBox6,imageItem, unitDialog, stateDialog, enginChart,projectStandardDialog},
+ components: {BorderBox6,imageItem, unitDialog, stateDialog, enginChart,projectStandardDialog,ListByCategory},
data() {
return {
label1: '项目标准化管理',
@@ -151,6 +157,13 @@ export default {
}
},
methods: {
+ getInfo(){
+ let obj={
+ deptId: this.dept?.id || 0,
+ projectId: this.project?.id || 0
+ };
+ return obj
+ },
doStandardDlg(it){
let obj={
deptId: this.dept?.id || 0,
@@ -534,8 +547,8 @@ export default {
this.$api.flow.groupByProject(this.dept?.id || 0),
this.$api.periodical.getList(),
this.$api.flow.groupByUnitTotal(this.project?.id || 0, this.dept?.id || 0),
- this.$api.flow.groupByUnitFinish(this.project?.id || 0, this.dept?.id || 0),
- this.$api.flow.groupByUnit(this.project?.id || 0, this.dept?.id || 0),
+ //this.$api.flow.groupByUnitFinish(this.project?.id || 0, this.dept?.id || 0),
+ //this.$api.flow.groupByUnit(this.project?.id || 0, this.dept?.id || 0),
];
this.$api.http.all(ajaxs).then(res => {
this.showChart1(res[0]);
@@ -544,8 +557,8 @@ export default {
this.showList2(res[3]);
this.showList3(res[4]);
this.showChart3(res[5]);
- this.showChart4(res[6]);
- this.showChart5(res[7]);
+ //this.showChart4(res[6]);
+ //this.showChart5(res[7]);
this.loading = false;
});
});
diff --git a/vue.config.js b/vue.config.js
index bd63956..01ca082 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,8 +37,8 @@ module.exports = defineConfig({
}
},
'/jhapi':{
- target: `http://62.234.3.186/jhapi/`,
- //target: `http://127.0.0.1:8090/jhapi/`,
+ //target: `http://62.234.3.186/jhapi/`,
+ target: `http://127.0.0.1:8090/jhapi/`,
changeOrigin: true,
pathRewrite: {
'^/jhapi':'/'