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-09-06 17:07:08 +08:00
parent 339f8033cd f9868d0494
commit 3b96be33e2
16 changed files with 133 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.development
View File

@ -7,8 +7,9 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
# 接口地址
#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
#VUE_APP_WS_API = 'ws://localhost:8000'
VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
#VUE_APP_BASEURL = http://127.0.0.1:8000
#VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
VUE_APP_BASEURL = http://127.0.0.1:8000
# 本地端口
VUE_APP_PORT = 2800

BIN
public/img/driver.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

4
src/api/model/hrm.js
View File

@ -4,7 +4,7 @@ import http from "@/utils/request"
export default {
employee: {
list: {
name: "获取企业员工",
name: "获取正式员工",
req: async function(data){
return await http.get(
`${config.API_URL}/hrm/employee/`,
@ -19,7 +19,7 @@ export default {
}
},
item: {
name: "获取企业员工",
name: "获取正式员工",
req: async function(id){
return await http.get(
`${config.API_URL}/hrm/employee/${id}/`,

4
src/components/ehsSelect/epselect.vue
View File

@ -229,7 +229,7 @@ export default {
// choseTypeOptions: [
// {
// value: 'employee',
// label: '企业员工'
// label: '正式员工'
// },
// {
// value: 'remployee',
@ -237,7 +237,7 @@ export default {
// }
// ]
userTypeOptions :{
'employee': '企业员工',
'employee': '正式员工',
'remployee': '相关方',
'visitor': '访客'
}

4
src/components/ehsSelect/userselect.vue
View File

@ -233,7 +233,7 @@ export default {
choseTypeOptions: [
{
value: 'employee',
label: '企业员工'
label: '正式员工'
},
{
value: 'remployee',
@ -249,7 +249,7 @@ export default {
}
],
userTypeOptions :{
'employee': '企业员工',
'employee': '正式员工',
'remployee': '相关方',
'visitor': '访客'
}

7
src/layout/components/userbar.vue
View File

@ -70,8 +70,8 @@
</el-scrollbar>
</el-main>
<el-footer>
<el-button type="primary">消息中心</el-button>
<el-button @click="markRead">全部设为已读</el-button>
<el-button type="primary" @click="goEvent">事件中心</el-button>
<!-- <el-button @click="markRead">全部设为已读</el-button> -->
</el-footer>
</el-container>
</el-drawer>
@ -136,6 +136,9 @@ export default {
this.msgList = res;
});
},
goEvent() {
this.$router.push({name:"event"})
},
createhandele(id) {
this.$router.push({
name: "eventhandlefrom",

12
src/views/bigScreen/index.vue
View File

@ -54,7 +54,7 @@
:class="{'active':dropIndex==='1'}">全部
</div>
<div @click="changeDropIndex('2')" class="drop-content-item"
:class="{'active':dropIndex==='2'}">内部员工
:class="{'active':dropIndex==='2'}">正式员工
<div></div>
</div>
<div @click="changeDropIndex('3')" class="drop-content-item"
@ -105,7 +105,7 @@
<div class="count-list-item">
<div class="item-img item-img2"></div>
<div class="item-info">
<div title="员工" class="normal">内部员工</div>
<div title="员工" class="normal">正式员工</div>
<div class="bottom">
<span class="large">{{ userCount.count_employee }}</span>&nbsp;<span
class="normal">人</span>
@ -393,7 +393,7 @@
</div>
<div class="info-item">
<span class="info-item-name">类型：</span>
<span class="info-item-info" v-if="screenUserItem.type === 'employee'">内部员工</span>
<span class="info-item-info" v-if="screenUserItem.type === 'employee'">正式员工</span>
<span class="info-item-info" v-else>访客</span>
</div>
<div class="info-item">
@ -810,7 +810,7 @@ export default {
//数据统计
userCount: {
total: 0,
count_employee: 0,//内部员工
count_employee: 0,//正式员工
count_remployee: 0,//访客
count_visitor: 0//相关方
},
@ -1104,8 +1104,8 @@ export default {
obj.label = '全部';
} else if (i === 1) {
obj.id = '';
obj.name = '内部员工';
obj.label = '内部员工';
obj.name = '正式员工';
obj.label = '正式员工';
obj.children = children;
} else if (i === 2) {
obj.id = '';

17
src/views/ecm/event.vue
View File

@ -1,18 +1,15 @@
<template>
<el-container>
<!-- <el-header>
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
<el-button type="primary" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button>
<el-select v-model="query.cates" placeholder="事件种类" @change="handleQuery">
<el-option v-for="item in cateOptions" :key="item.id">{{item.name}}</el-option>
</el-select>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input v-model="query.search" placeholder="姓名/手机号" clearable @click="handleQuery"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div>
</div>
</el-header> -->
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
@ -47,7 +44,7 @@
scope.row.employee_.type != '' &&
scope.row.employee_.type == 'employee'
"
>企业员工</span
>正式员工</span
>
<span
v-if="

2
src/views/ecm/event_from.vue
View File

@ -167,7 +167,7 @@ export default {
show: "事件信息查看",
},
type_options: [
{ id: "employee", name: "企业员工" },
{ id: "employee", name: "正式员工" },
{ id: "remployee", name: "相关方" },
{ id: "visitor", name: "访客" },
],

4
src/views/ecm/event_handlefrom.vue
View File

@ -167,12 +167,12 @@ export default {
show: "事件信息查看",
},
type_options: [
{ id: "employee", name: "企业员工" },
{ id: "employee", name: "正式员工" },
{ id: "remployee", name: "相关方" },
{ id: "visitor", name: "访客" },
],
type_options2: {
employee: "企业员工",
employee: "正式员工",
remployee: "相关方",
visitor: "访客",
},

4
src/views/home/widgets/components/eventlist.vue
View File

@ -11,7 +11,7 @@
<div v-for="item in dutyAgg" :key="item.workflow">
<el-badge :value="item.count" class="item">
<el-button
icon="el-icon-document-copy"
icon="el-icon-promotion"
type="primary"
size="small"
@click="toTicket"
@ -71,7 +71,7 @@
scope.row.employee_.type != '' &&
scope.row.employee_.type == 'employee'
"
>企业员工</span
>正式员工</span
>
<span
v-if="

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

@ -12,8 +12,8 @@
<el-badge :value="operationnumber" class="item">
<el-button
class="projecting"
icon="el-icon-document-copy"
type="primary"
icon="el-icon-bell"
type="danger"
size="small"
></el-button>
</el-badge>
@ -23,23 +23,34 @@
<el-badge :value="rpjnumber" class="item">
<el-button
class="projecting"
icon="el-icon-document-copy"
icon="el-icon-user"
type="success"
size="small"
></el-button>
</el-badge>
<div style="font-size: 16px">相关方入厂</div>
</div>
<div>
<el-badge :value="visitnumber2" class="item">
<el-button
class="projecting"
icon="el-icon-van"
type="warning"
size="small"
></el-button>
</el-badge>
<div style="font-size: 16px">相关方项目</div>
<div style="font-size: 16px">拉送货</div>
</div>
<div>
<el-badge :value="visitnumber" class="item">
<el-button
class="projecting"
icon="el-icon-document-copy"
type="success"
icon="el-icon-view"
type="primary"
size="small"
></el-button>
</el-badge>
<div style="font-size: 16px">来访项目</div>
<div style="font-size: 16px">来访</div>
</div>
</div>
</el-card>
@ -61,7 +72,7 @@
<div class="count-list-item">
<div class="item-img item-img1"></div>
<div class="item-info">
<div title="员工" class="normal">内部员工</div>
<div title="正式员工" class="normal">正式员工</div>
<div class="bottom">
<span class="large">{{ userCount.count_employee }}</span
>&nbsp;<span class="normal">人</span>
@ -71,17 +82,27 @@
<div class="count-list-item">
<div class="item-img item-img3"></div>
<div class="item-info">
<div title="承包商" class="normal">相关方</div>
<div title="相关方" class="normal">相关方</div>
<div class="bottom">
<span class="large">{{ userCount.count_remployee }}</span
>&nbsp;<span class="normal">人</span>
</div>
</div>
</div>
<div class="count-list-item">
<div class="item-img item-img4"></div>
<div class="item-info">
<div title="司机" class="normal">货车司机</div>
<div class="bottom">
<span class="large">{{ userCount.count_driver }}</span
>&nbsp;<span class="normal">人</span>
</div>
</div>
</div>
<div class="count-list-item">
<div class="item-img item-img2"></div>
<div class="item-info">
<div title="外来人员" class="normal">访客</div>
<div title="访客" class="normal">访客</div>
<div class="bottom">
<span class="large">{{ userCount.count_visitor }}</span
>&nbsp;<span class="normal">人</span>
@ -105,13 +126,15 @@ export default {
ep_count_type: "2",
userCount: {
total: 0,
count_employee: 0, //内部员工
count_employee: 0, //正式员工
count_remployee: 0, //访客
count_visitor: 0, //相关方
count_driver: 0,
},
operationnumber: null,
rpjnumber: null,
visitnumber: null,
operationnumber: 0,
rpjnumber: 0,
visitnumber: 0,
visitnumber2: 0,
};
},
created() {
@ -120,6 +143,7 @@ export default {
this.getOperation();
this.getRpj();
this.getVisit();
this.getVisit2();
},
methods: {
//工单待办
@ -175,6 +199,14 @@ export default {
this.visitnumber = res.count;
});
},
//司机
getVisit2() {
this.$API.vm.visit.list
.req({ page: 1, page_size: 1, state: 40, type: 50 })
.then((res) => {
this.visitnumber2 = res.count;
});
},
},
};
</script>
@ -296,6 +328,11 @@ export default {
background-size: 100% 100%;
}
.item-img4 {
background: url(/public/img/driver.png) no-repeat;
background-size: 100% 100%;
}
.item-info {
.normal {
font-size: 12px;

2
src/views/hrm/employee.vue
View File

@ -199,7 +199,7 @@ export default {
employee: "",
},
userTypeOptions: {
employee: "企业员工",
employee: "正式员工",
remployee: "相关方",
visitor: "访客",
},

2
src/views/hrm/ep_form.vue
View File

@ -173,7 +173,7 @@
isSaveing: false,
form: defaultForm,
epTypes: {
'employee': "企业员工",
'employee': "正式员工",
"remployee": "相关方",
"visitor": "访客"
},

2
src/views/sys/user.vue
View File

@ -278,7 +278,7 @@ export default {
temp: [],
postList: [],
userTypeOptions :{
'employee': '企业员工',
'employee': '正式员工',
'remployee': '相关方',
'visitor': '访客',
'driver':'司机'

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

@ -9,7 +9,7 @@
></el-button>
</div>
</el-header>
<el-main class="nopadding" style="height: 100%;">
<el-main class="nopadding" style="height: 100%">
<scTable
ref="table"
:data="list"
@ -43,18 +43,23 @@
</el-table-column>
<el-table-column label="参与人类型">
<template #default="scope">
{{options_[scope.row.participant_type]}}</template>
{{ options_[scope.row.participant_type] }}</template
>
</el-table-column>
<el-table-column label="分配方式">
<el-table-column label="分配方式">
<template #default="scope">
{{options2_[scope.row.distribute_type]}}</template>
{{ options2_[scope.row.distribute_type] }}</template
>
</el-table-column>
<el-table-column label="创建时间" prop="create_time"></el-table-column>
<el-table-column label="操作" fixed="right" align="right" width="120">
<template #default="scope">
<el-button link size="small" @click="handleEdit(scope.row)"
>编辑</el-button>
<el-button link size="small" @click="handleDelete(scope.row)">删除</el-button>
>编辑</el-button
>
<el-button link size="small" @click="handleDelete(scope.row)"
>删除</el-button
>
</template>
</el-table-column>
</scTable>
@ -132,9 +137,18 @@
<el-option
v-for="item in staffs"
:key="item.id"
:label="item.name"
:label="item.name + '-' + item.phone"
:value="item.id"
>
<span style="float: left">{{ item.name }}</span>
<span
style="
float: right;
color: var(--el-text-color-secondary);
font-size: 13px;
"
>{{ item.phone }}</span
>
</el-option>
</el-select>
</el-form-item>
@ -155,6 +169,15 @@
:label="item.name"
:value="item.id"
>
<span style="float: left">{{ item.name }}</span>
<span
style="
float: right;
color: var(--el-text-color-secondary);
font-size: 13px;
"
>{{ item.phone }}</span
>
</el-option>
</el-select>
</el-form-item>
@ -178,23 +201,20 @@
</el-select> -->
<el-input v-model="addForm.participant" placeholder="工单字段" />
</el-form-item>
<el-form-item
label="参与者"
prop="participant"
v-if="addForm.participant_type == 6"
>
<el-input v-model="addForm.participant" placeholder="方法名" />
</el-form-item>
<el-form-item
label="分配方式"
label="参与者"
prop="participant"
v-if="addForm.participant_type == 6"
>
<el-input v-model="addForm.participant" placeholder="方法名" />
</el-form-item>
<el-form-item label="分配方式" prop="participant">
<el-select
style="width: 100%"
v-model="addForm.distribute_type"
placeholder="请选择分配方式"
>
<el-option
<el-option
v-for="item in dis_type_options"
:key="item.value"
:label="item.label"
@ -245,7 +265,11 @@
<el-form-item
label="部门过滤"
prop="filter_dept"
v-if="addForm.participant_type == 4 || addForm.participant_type == 0|| addForm.participant_type == 10"
v-if="
addForm.participant_type == 4 ||
addForm.participant_type == 0 ||
addForm.participant_type == 10
"
>
<el-input v-model="addForm.filter_dept" placeholder="部门字段" />
</el-form-item>
@ -328,7 +352,7 @@
</el-col>
</el-row>
</el-form-item>
<el-form-item label="到达方法" prop="on_reach_func">
<el-form-item label="到达方法" prop="on_reach_func">
<el-input v-model="addForm.on_reach_func" placeholder="到达方法" />
</el-form-item>
</el-form>
@ -391,7 +415,7 @@ export default {
9: "代码获取",
10: "岗位",
},
options2_: {
options2_: {
1: "主动接单",
2: "直接处理",
3: "随机分配",
@ -512,7 +536,7 @@ export default {
let roles = await this.$API.system.role.list.req({ page: 0 });
this.roles = roles;
},
//获取岗位
//获取岗位
async getPost() {
let posts = await this.$API.system.post.list.req({ page: 0 });
this.posts = posts;
@ -578,9 +602,9 @@ export default {
this.addForm = Object.assign({}, row);
},
handleDelete(row) {
this.$API.wf.state.delete.req(row.id).then(res=>{
this.getList()
})
this.$API.wf.state.delete.req(row.id).then((res) => {
this.getList();
});
},
async getList() {
let res = await this.$API.wf.workflow.states.req(this.id);