diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue index eeb4a8fe..dd622826 100644 --- a/src/views/home/widgets/components/ticket.vue +++ b/src/views/home/widgets/components/ticket.vue @@ -10,45 +10,25 @@
- +
危险作业
- +
相关方入厂
- +
拉送货
- +
来访
@@ -74,8 +54,7 @@
正式员工
- {{ userCount.count_employee }}  + {{ userCount.count_employee }} 
@@ -84,8 +63,7 @@
相关方
- {{ userCount.count_remployee }}  + {{ userCount.count_remployee }} 
@@ -94,8 +72,7 @@
货车司机
- {{ userCount.count_driver }}  + {{ userCount.count_driver }} 
@@ -104,8 +81,7 @@
访客
- {{ userCount.count_visitor }}  + {{ userCount.count_visitor }} 
@@ -143,7 +119,6 @@ export default { this.getManCount(); //人员统计$$ this.getOperation(); this.getRpj(); - this.getVisit(); this.getVisit2(); }, methods: { @@ -203,9 +178,14 @@ export default { //司机 getVisit2() { this.$API.vm.visit.list - .req({ page: 1, page_size: 1, state: 40, type: 50 }) + .req({ page: 1, page_size: 1, state: 40, purpose: 50 }) .then((res) => { this.visitnumber2 = res.count; + this.$API.vm.visit.list + .req({ page: 1, page_size: 1, state: 40 }) + .then((res2) => { + this.visitnumber = res2.count - this.visitnumber2; + }); }); }, }, @@ -218,6 +198,7 @@ export default { height: 45px; font-size: 25px; } + .welcome .logo { text-align: center; } @@ -261,10 +242,12 @@ export default { color: var(--el-color-primary); background: rgba(180, 180, 180, 0.1); } + .item { margin-top: 10px; margin-right: 40px; } + .tips-item-message { flex: 1; font-size: 14px; @@ -274,11 +257,14 @@ export default { background: url(/public/img/zuoye.png) no-repeat; background-size: 100% 100%; } + .actions { text-align: center; margin: 40px 0 20px 0; } + .screen-cockpits { + // margin-top: -15px; .cockpit-count { .count-list { @@ -287,6 +273,7 @@ export default { justify-content: space-around; align-items: center; height: 80px; + .count-list-item { width: 33.3333%; height: 50%; @@ -361,6 +348,7 @@ export default { display: flex; align-items: center; justify-content: space-between; + .countTypeWrap { font-size: 14px; @@ -497,12 +485,14 @@ export default { } } } + .card-header { display: flex; justify-content: space-between; align-items: center; height: 24px; } + .card-body { display: flex; justify-content: space-around; diff --git a/src/views/rpm/rpj.vue b/src/views/rpm/rpj.vue index 270d5997..d73e440e 100644 --- a/src/views/rpm/rpj.vue +++ b/src/views/rpm/rpj.vue @@ -76,7 +76,14 @@ label="名称" prop="name" fixed="left" - width="180" + width="200" + :show-overflow-tooltip="true" + > + @@ -133,11 +140,6 @@ prop="belong_dept_name" width="180" > - 编辑 --> diff --git a/src/views/vm/visit.vue b/src/views/vm/visit.vue index 20f7f186..79215d43 100644 --- a/src/views/vm/visit.vue +++ b/src/views/vm/visit.vue @@ -6,7 +6,7 @@ type="primary" icon="el-icon-plus" @click="add" - > + >新建项目 - + @@ -170,7 +170,7 @@ >查看 diff --git a/src/views/wf/workflow.vue b/src/views/wf/workflow.vue index ce5c7c03..bb1ad2c6 100644 --- a/src/views/wf/workflow.vue +++ b/src/views/wf/workflow.vue @@ -71,7 +71,6 @@ v-auth="'workflow.update'" >配置 - 编辑 - 流程图 - -
+