zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

This commit is contained in:
shijing 2022-10-28 10:56:02 +08:00
parent 1d5822000f 48fc7dcfed
commit 8d20056f4a
5 changed files with 40 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/views/home/widgets/components/ticket.vue
View File

@ -10,45 +10,25 @@
<div class="card-body"> <div class="card-body">
<div> <div>
<el-badge :value="operationnumber" class="item"> <el-badge :value="operationnumber" class="item">
<el-button <el-button class="projecting" icon="el-icon-bell" type="danger" size="small"></el-button>
class="projecting"
icon="el-icon-bell"
type="danger"
size="small"
></el-button>
</el-badge> </el-badge>
<div style="font-size: 16px">危险作业</div> <div style="font-size: 16px">危险作业</div>
</div> </div>
<div> <div>
<el-badge :value="rpjnumber" class="item"> <el-badge :value="rpjnumber" class="item">
<el-button <el-button class="projecting" icon="el-icon-user" type="success" size="small"></el-button>
class="projecting"
icon="el-icon-user"
type="success"
size="small"
></el-button>
</el-badge> </el-badge>
<div style="font-size: 16px">相关方入厂</div> <div style="font-size: 16px">相关方入厂</div>
</div> </div>
<div> <div>
<el-badge :value="visitnumber2" class="item"> <el-badge :value="visitnumber2" class="item">
<el-button <el-button class="projecting" icon="el-icon-van" type="warning" size="small"></el-button>
class="projecting"
icon="el-icon-van"
type="warning"
size="small"
></el-button>
</el-badge> </el-badge>
<div style="font-size: 16px">拉送货</div> <div style="font-size: 16px">拉送货</div>
</div> </div>
<div> <div>
<el-badge :value="visitnumber" class="item"> <el-badge :value="visitnumber" class="item">
<el-button <el-button class="projecting" icon="el-icon-view" type="primary" size="small"></el-button>
class="projecting"
icon="el-icon-view"
type="primary"
size="small"
></el-button>
</el-badge> </el-badge>
<div style="font-size: 16px">来访</div> <div style="font-size: 16px">来访</div>
</div> </div>
@ -74,8 +54,7 @@
<div class="item-info"> <div class="item-info">
<div title="正式员工" class="normal">正式员工</div> <div title="正式员工" class="normal">正式员工</div>
<div class="bottom"> <div class="bottom">
<span class="large">{{ userCount.count_employee }}</span <span class="large">{{ userCount.count_employee }}</span>&nbsp;<span class="normal">人</span>
>&nbsp;<span class="normal">人</span>
</div> </div>
</div> </div>
</div> </div>
@ -84,8 +63,7 @@
<div class="item-info"> <div class="item-info">
<div title="相关方" class="normal">相关方</div> <div title="相关方" class="normal">相关方</div>
<div class="bottom"> <div class="bottom">
<span class="large">{{ userCount.count_remployee }}</span <span class="large">{{ userCount.count_remployee }}</span>&nbsp;<span class="normal">人</span>
>&nbsp;<span class="normal">人</span>
</div> </div>
</div> </div>
</div> </div>
@ -94,8 +72,7 @@
<div class="item-info"> <div class="item-info">
<div title="司机" class="normal">货车司机</div> <div title="司机" class="normal">货车司机</div>
<div class="bottom"> <div class="bottom">
<span class="large">{{ userCount.count_driver }}</span <span class="large">{{ userCount.count_driver }}</span>&nbsp;<span class="normal">人</span>
>&nbsp;<span class="normal">人</span>
</div> </div>
</div> </div>
</div> </div>
@ -104,8 +81,7 @@
<div class="item-info"> <div class="item-info">
<div title="访客" class="normal">访客</div> <div title="访客" class="normal">访客</div>
<div class="bottom"> <div class="bottom">
<span class="large">{{ userCount.count_visitor }}</span <span class="large">{{ userCount.count_visitor }}</span>&nbsp;<span class="normal">人</span>
>&nbsp;<span class="normal">人</span>
</div> </div>
</div> </div>
</div> </div>
@ -143,7 +119,6 @@ export default {
this.getManCount(); //人员统计$$ this.getManCount(); //人员统计$$
this.getOperation(); this.getOperation();
this.getRpj(); this.getRpj();
this.getVisit();
this.getVisit2(); this.getVisit2();
}, },
methods: { methods: {
@ -203,9 +178,14 @@ export default {
//司机 //司机
getVisit2() { getVisit2() {
this.$API.vm.visit.list 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) => { .then((res) => {
this.visitnumber2 = res.count; 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; height: 45px;
font-size: 25px; font-size: 25px;
} }
.welcome .logo { .welcome .logo {
text-align: center; text-align: center;
} }
@ -261,10 +242,12 @@ export default {
color: var(--el-color-primary); color: var(--el-color-primary);
background: rgba(180, 180, 180, 0.1); background: rgba(180, 180, 180, 0.1);
} }
.item { .item {
margin-top: 10px; margin-top: 10px;
margin-right: 40px; margin-right: 40px;
} }
.tips-item-message { .tips-item-message {
flex: 1; flex: 1;
font-size: 14px; font-size: 14px;
@ -274,11 +257,14 @@ export default {
background: url(/public/img/zuoye.png) no-repeat; background: url(/public/img/zuoye.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
.actions { .actions {
text-align: center; text-align: center;
margin: 40px 0 20px 0; margin: 40px 0 20px 0;
} }
.screen-cockpits { .screen-cockpits {
// margin-top: -15px; // margin-top: -15px;
.cockpit-count { .cockpit-count {
.count-list { .count-list {
@ -287,6 +273,7 @@ export default {
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
height: 80px; height: 80px;
.count-list-item { .count-list-item {
width: 33.3333%; width: 33.3333%;
height: 50%; height: 50%;
@ -361,6 +348,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.countTypeWrap { .countTypeWrap {
font-size: 14px; font-size: 14px;
@ -497,12 +485,14 @@ export default {
} }
} }
} }
.card-header { .card-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 24px; height: 24px;
} }
.card-body { .card-body {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;

16
src/views/rpm/rpj.vue
View File

@ -76,7 +76,14 @@
label="名称" label="名称"
prop="name" prop="name"
fixed="left" fixed="left"
width="180" width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
label="相关方"
prop="rparty_name"
width="200"
:show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column label="项目类型" prop="type" width="180"> <el-table-column label="项目类型" prop="type" width="180">
<template #default="scope">{{ type_[scope.row.type] }} </template> <template #default="scope">{{ type_[scope.row.type] }} </template>
@ -133,11 +140,6 @@
prop="belong_dept_name" prop="belong_dept_name"
width="180" width="180"
></el-table-column> ></el-table-column>
<el-table-column
label="相关方"
prop="rparty_name"
width="180"
></el-table-column>
<el-table-column <el-table-column
label="创建人" label="创建人"
prop="create_by_name" prop="create_by_name"
@ -175,7 +177,7 @@
>编辑 >编辑
</el-button>--> </el-button>-->
<el-popconfirm <el-popconfirm
v-if="scope.row.state == 10" v-if="scope.row.state != 30"
title="确定删除吗？" title="确定删除吗？"
@confirm="table_del(scope.row, scope.$index)" @confirm="table_del(scope.row, scope.$index)"
> >

6
src/views/vm/visit.vue
View File

@ -6,7 +6,7 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="add" @click="add"
></el-button> >新建项目</el-button>
<el-select <el-select
v-model="query.purpose" v-model="query.purpose"
placeholder="来访事由" placeholder="来访事由"
@ -65,7 +65,7 @@
width="50" width="50"
></el-table-column> ></el-table-column>
<el-table-column label="来访事由" prop="state" width="180" fixed="left"> <el-table-column label="来访事由" prop="state" width="100" fixed="left">
<template #default="scope">{{ <template #default="scope">{{
purpose_[scope.row.purpose] purpose_[scope.row.purpose]
}}</template> }}</template>
@ -170,7 +170,7 @@
>查看 >查看
</el-button> </el-button>
<el-button <el-button
v-if="scope.row.state == 10" v-if="scope.row.state != 30"
link link
type="danger" type="danger"
size="small" size="small"

4
src/views/wf/state.vue
View File

@ -133,6 +133,7 @@
style="width: 100%" style="width: 100%"
v-model="addForm.participant" v-model="addForm.participant"
placeholder="请选择参与者" placeholder="请选择参与者"
filterable
> >
<el-option <el-option
v-for="item in staffs" v-for="item in staffs"
@ -296,11 +297,12 @@
v-model="addForm.participant_cc" v-model="addForm.participant_cc"
multiple multiple
placeholder="请选择抄送给谁" placeholder="请选择抄送给谁"
filterable
> >
<el-option <el-option
v-for="item in staffs" v-for="item in staffs"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '-' + item.phone"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>

5
src/views/wf/workflow.vue
View File

@ -71,7 +71,6 @@
v-auth="'workflow.update'" v-auth="'workflow.update'"
>配置 >配置
</el-button> </el-button>
<el-divider direction="vertical"></el-divider>
<el-button <el-button
link link
size="small" size="small"
@ -80,7 +79,6 @@
v-auth="'workflow.update'" v-auth="'workflow.update'"
>编辑 >编辑
</el-button> </el-button>
<el-divider direction="vertical"></el-divider>
<el-button <el-button
link link
size="small" size="small"
@ -89,7 +87,6 @@
> >
流程图 流程图
</el-button> </el-button>
<el-divider direction="vertical"></el-divider>
<el-popconfirm <el-popconfirm
title="确定删除吗？" title="确定删除吗？"
@confirm="workflowDel(scope.row)" @confirm="workflowDel(scope.row)"
@ -117,7 +114,7 @@
@click="closeMark" @click="closeMark"
></i> ></i>
</div> </div>
<div style="width: 90%; margin: auto"> <div style="width: 100%; margin: auto">
<svg <svg
:height="mySvgHeight" :height="mySvgHeight"
id="mySvg" id="mySvg"