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

首页修改

This commit is contained in:
曹前明 2022-09-06 15:51:06 +08:00
parent 1a1d809fe3
commit f9868d0494
15 changed files with 86 additions and 48 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_API_BASEURL = http://1.203.161.103:2800/api
#VUE_APP_WS_API = 'ws://localhost:8000' #VUE_APP_WS_API = 'ws://localhost:8000'
VUE_APP_API_BASEURL = http://10.99.5.79:20309/api #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://127.0.0.1:8000/api
VUE_APP_BASEURL = http://127.0.0.1:8000
# 本地端口 # 本地端口
VUE_APP_PORT = 2800 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 { export default {
employee: { employee: {
list: { list: {
name: "获取企业员工", name: "获取正式员工",
req: async function(data){ req: async function(data){
return await http.get( return await http.get(
`${config.API_URL}/hrm/employee/`, `${config.API_URL}/hrm/employee/`,
@ -19,7 +19,7 @@ export default {
} }
}, },
item: { item: {
name: "获取企业员工", name: "获取正式员工",
req: async function(id){ req: async function(id){
return await http.get( return await http.get(
`${config.API_URL}/hrm/employee/${id}/`, `${config.API_URL}/hrm/employee/${id}/`,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -12,8 +12,8 @@
<el-badge :value="operationnumber" class="item"> <el-badge :value="operationnumber" class="item">
<el-button <el-button
class="projecting" class="projecting"
icon="el-icon-document-copy" icon="el-icon-bell"
type="primary" type="danger"
size="small" size="small"
></el-button> ></el-button>
</el-badge> </el-badge>
@ -23,23 +23,34 @@
<el-badge :value="rpjnumber" class="item"> <el-badge :value="rpjnumber" class="item">
<el-button <el-button
class="projecting" 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" type="warning"
size="small" size="small"
></el-button> ></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" class="projecting"
icon="el-icon-document-copy" icon="el-icon-view"
type="success" type="primary"
size="small" size="small"
></el-button> ></el-button>
</el-badge> </el-badge>
<div style="font-size: 16px">来访项目</div> <div style="font-size: 16px">来访</div>
</div> </div>
</div> </div>
</el-card> </el-card>
@ -61,7 +72,7 @@
<div class="count-list-item"> <div class="count-list-item">
<div class="item-img item-img1"></div> <div class="item-img item-img1"></div>
<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>
@ -71,17 +82,27 @@
<div class="count-list-item"> <div class="count-list-item">
<div class="item-img item-img3"></div> <div class="item-img item-img3"></div>
<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>
<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="count-list-item">
<div class="item-img item-img2"></div> <div class="item-img item-img2"></div>
<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>
@ -105,13 +126,15 @@ export default {
ep_count_type: "2", ep_count_type: "2",
userCount: { userCount: {
total: 0, total: 0,
count_employee: 0, //内部员工 count_employee: 0, //正式员工
count_remployee: 0, //访客 count_remployee: 0, //访客
count_visitor: 0, //相关方 count_visitor: 0, //相关方
count_driver: 0,
}, },
operationnumber: null, operationnumber: 0,
rpjnumber: null, rpjnumber: 0,
visitnumber: null, visitnumber: 0,
visitnumber2: 0,
}; };
}, },
created() { created() {
@ -120,6 +143,7 @@ export default {
this.getOperation(); this.getOperation();
this.getRpj(); this.getRpj();
this.getVisit(); this.getVisit();
this.getVisit2();
}, },
methods: { methods: {
//工单待办 //工单待办
@ -175,6 +199,14 @@ export default {
this.visitnumber = res.count; 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> </script>
@ -296,6 +328,11 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
} }
.item-img4 {
background: url(/public/img/driver.png) no-repeat;
background-size: 100% 100%;
}
.item-info { .item-info {
.normal { .normal {
font-size: 12px; font-size: 12px;

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

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

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

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

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

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