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

fire页面采用选人组件

This commit is contained in:
曹前明 2022-09-02 17:14:55 +08:00
parent 50a17fbd1d
commit 188f3ab2e7
13 changed files with 94 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -7,7 +7,8 @@ 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://127.0.0.1:8000/api #VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
#VUE_APP_BASEURL = http://127.0.0.1:8000 #VUE_APP_BASEURL = http://127.0.0.1:8000
# 本地端口 # 本地端口

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

@ -28,19 +28,19 @@
<el-col :md="multiple?18:24" :sm="24"> <el-col :md="multiple?18:24" :sm="24">
<el-card header="账号列表" shadow="never"> <el-card header="账号列表" shadow="never">
<el-row > <el-row >
<!-- <el-col :md="6" :sm="24"> <el-col :md="6" :sm="24">
<el-select v-model="query.type" placeholder="人员类型" @change="handleTypeChange"> <el-select v-model="userTypeChecked" placeholder="人员类型" @change="handleQuery" :multiple="true">
<el-option v-for="item in choseTypeOptions" :key="item" :label="item.label" <el-option v-for="item in choseTypeOptions" :key="item" :label="item.label"
:value="item.value"></el-option> :value="item.value"></el-option>
</el-select> </el-select>
</el-col> --> </el-col>
<el-col :md="8" :sm="24"> <el-col :md="6" :sm="24">
<el-cascader style="width:90%" v-model="query.depts" :options="deptdata" clearable placeholder="部门/单位" @change="handleQuery" :show-all-levels="false" :props="{emitPath:false}"/> <el-cascader style="width:90%" v-model="query.depts" :options="deptdata" clearable placeholder="部门/单位" @change="handleQuery" :show-all-levels="false" :props="{emitPath:false}"/>
</el-col> </el-col>
<el-col :md="8" :sm="24"> <el-col :md="6" :sm="24">
<el-cascader style="width:90%" v-model="query.posts" :options="postdata" clearable placeholder="岗位" @change="handleQuery" :show-all-levels="false" :props="{emitPath:false}"/> <el-cascader style="width:90%" v-model="query.posts" :options="postdata" clearable placeholder="岗位" @change="handleQuery" :show-all-levels="false" :props="{emitPath:false}"/>
</el-col> </el-col>
<el-col :md="8" :sm="24"> <el-col :md="6" :sm="24">
<div style="display:flex"> <div style="display:flex">
<el-input <el-input
v-model="query.search" v-model="query.search"
@ -229,17 +229,25 @@ export default {
dialoguser: false, dialoguser: false,
dataValue: this.value, dataValue: this.value,
choseData: {}, choseData: {},
// choseType: 'employee', userTypeChecked: [],
// choseTypeOptions: [ choseTypeOptions: [
// { {
// value: 'employee', value: 'employee',
// label: '企业员工' label: '企业员工'
// }, },
// { {
// value: 'remployee', value: 'remployee',
// label: '相关方' label: '相关方'
// } },
// ] {
value: 'visitor',
label: '访客'
},
{
value: 'driver',
label: '货车司机'
}
],
userTypeOptions :{ userTypeOptions :{
'employee': '企业员工', 'employee': '企业员工',
'remployee': '相关方', 'remployee': '相关方',
@ -281,6 +289,10 @@ export default {
}, },
//加载人员 //加载人员
handleQuery() { handleQuery() {
this.query.type__in = null;
if(this.userTypeChecked){
this.query.type__in = this.userTypeChecked.join(',')
}
this.$refs.table.queryData(this.query) this.$refs.table.queryData(this.query)
}, },
//加载部门树数据 //加载部门树数据

7
src/components/scOpl/scFire.vue
View File

@ -360,8 +360,6 @@
that.oplId = that.id; //许可证ID that.oplId = that.id; //许可证ID
this.$nextTick(()=>{ this.$nextTick(()=>{
that.getOplData(); that.getOplData();
// that.getDept();
// that.getUser();
that.getworkerList(); that.getworkerList();
that.getgasList(); that.getgasList();
}) })
@ -407,11 +405,6 @@
// }); // });
// }, // },
// //作业负责人、作业监护人 // //作业负责人、作业监护人
// getUser() {
// this.$API.system.user.list.req({page: 0}).then((res) => {
// this.useroptions = res;
// });
// },
//作业人员列表 //作业人员列表
getworkerList() { getworkerList() {
this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => { this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {

7
src/views/am/area_form.vue
View File

@ -191,7 +191,6 @@
}, },
mounted() { mounted() {
this.getGroup(); this.getGroup();
// this.getUser();
}, },
methods: { methods: {
//加载树数据 //加载树数据
@ -199,12 +198,6 @@
let res = await this.$API.system.dept.list.req({page: 0}); let res = await this.$API.system.dept.list.req({page: 0});
this.group = genTree(res); this.group = genTree(res);
}, },
//项目负责人
// getUser() {
// this.$API.system.user.list.req({page: 0}).then((res) => {
// this.useroptions = res;
// });
// },
getManager(data){ getManager(data){
this.form.manager=data.id; this.form.manager=data.id;
this.form.manager_name=data.name this.form.manager_name=data.name

21
src/views/ecm/event_cate_form.vue
View File

@ -73,7 +73,16 @@
<sc-title title="音响配置"></sc-title> <sc-title title="音响配置"></sc-title>
<el-row> <el-row>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="事件优先级" prop="priority" placeholder="数字越小级别越高"> <el-form-item label="喇叭开启" prop="speaker_on">
<el-switch v-model="form.speaker_on"></el-switch>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item
label="事件优先级"
prop="priority"
placeholder="数字越小级别越高"
>
<el-input-number <el-input-number
v-model="form.priority" v-model="form.priority"
:min="1" :min="1"
@ -130,13 +139,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <!-- <el-col :md="12" :sm="24">
<el-form-item label="喇叭开启" prop="speaker_on">
<el-switch v-model="form.speaker_on"></el-switch>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="开启区域" prop="filter_area_level"> <el-form-item label="开启区域" prop="filter_area_level">
<el-select v-model="form.filter_area_level"> <el-select v-model="form.filter_area_level">
<el-option <el-option
@ -147,7 +150,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>

1
src/views/ecm/notify_settings_form.vue
View File

@ -230,7 +230,6 @@ export default {
}, },
mounted() { mounted() {
this.getPostOptions(); this.getPostOptions();
// this.getUserOptions();
this.getEventCate(); this.getEventCate();
}, },
methods: { methods: {

5
src/views/hrm/clock_record.vue
View File

@ -39,6 +39,11 @@
<template #default="scope">{{trigger_[scope.row.trigger]}} <template #default="scope">{{trigger_[scope.row.trigger]}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="其他信息">
<template #default="scope">
<span v-if="scope.row.detail">{{scope.row.detail.deviceName}}</span>
</template>
</el-table-column>
<el-table-column label="打卡时间" prop="create_time"></el-table-column> <el-table-column label="打卡时间" prop="create_time"></el-table-column>
</scTable> </scTable>
</el-main> </el-main>

72
src/views/opm/fire.vue
View File

@ -89,6 +89,7 @@
label: 'label', // label: 'label', //
value: 'value', // value: 'value', //
emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值 emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
checkStrictly: true
}" }"
clearable clearable
/> />
@ -96,26 +97,30 @@
</el-col> </el-col>
<el-col :md="12" :sm="12" :xs="24"> <el-col :md="12" :sm="12" :xs="24">
<el-form-item label="作业负责人"> <el-form-item label="作业负责人">
<el-select v-model="form.charger" placeholder="选择作业负责人"> <el-input
v-model="form.charger_name"
style="width:200px"
disabled
></el-input>
<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
<el-option <el-option
v-for="item in useroptions" v-for="item in useroptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select> -->
<ehsUserSelect :multiple="false" @submit="getCharger"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="12" :xs="24"> <el-col :md="12" :sm="12" :xs="24">
<el-form-item label="作业监护人"> <el-form-item label="作业监护人">
<el-select v-model="form.monitor" placeholder="选择作业监护人"> <el-input
<el-option v-model="form.monitor_name"
v-for="item in useroptions" style="width:200px"
:key="item.id" disabled
:label="item.name" ></el-input>
:value="item.id" <ehsUserSelect :multiple="false" @submit="getMonitor"/>
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
@ -154,10 +159,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-card class="box-card"> <el-card header="应急处置">
<div class="clearfix">
<span>应急处置：</span>
</div>
<div class="content"> <div class="content">
<p>1、发生火灾时立即使用消防器材边灭火边报告</p> <p>1、发生火灾时立即使用消防器材边灭火边报告</p>
<p>2、预判火势无法控制时，应立即疏散人群并拨打110或119求救。</p> <p>2、预判火势无法控制时，应立即疏散人群并拨打110或119求救。</p>
@ -246,7 +248,7 @@
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
<sc-dialog v-model="workerdialog" draggable title="选择作业人员"> <el-dialog v-model="workerdialog" draggable title="选择作业人员">
<el-form <el-form
ref="workerForm" ref="workerForm"
:model="formworker" :model="formworker"
@ -259,18 +261,12 @@
<el-row> <el-row>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="作业人员"> <el-form-item label="作业人员">
<el-select <el-input
v-model="formworker.worker" v-model="formworker.worker_name"
@change="selectWorker" style="width:200px"
placeholder="选择作业人员" disabled
> ></el-input>
<el-option <ehsUserSelect :multiple="false" @submit="getWorker"/>
v-for="item in useroptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
@ -313,7 +309,7 @@
<el-button @click="dialogcart = false">取 消</el-button> <el-button @click="dialogcart = false">取 消</el-button>
<el-button type="primary" @click="submitWorker">确 定</el-button> <el-button type="primary" @click="submitWorker">确 定</el-button>
</template> </template>
</sc-dialog> </el-dialog>
<div style="margin-top:20px;text-align:center"> <div style="margin-top:20px;text-align:center">
<el-button style="margin-right: 4px" @click="handleLastStep" <el-button style="margin-right: 4px" @click="handleLastStep"
>上一步 >上一步
@ -600,9 +596,22 @@
this.getoplData(); this.getoplData();
this.getInit(); this.getInit();
this.getDept(); this.getDept();
this.getUser(); // this.getUser();
}, },
methods: { methods: {
getCharger(data) {
this.form.charger=data.id;
this.form.charger_name=data.name
},
getMonitor(data) {
this.form.monitor=data.id;
this.form.monitor_name=data.name
},
getWorker(data) {
this.formworker.worker=data.id,
this.formworker.worker_name=data.name
this.selectWorker()
},
getoplData() { getoplData() {
if (this.oplId == "") { if (this.oplId == "") {
this.getOperation(); this.getOperation();
@ -641,11 +650,6 @@
}, },
//作业负责人、作业监护人 //作业负责人、作业监护人
getUser() {
this.$API.system.user.list.req({page: 0}).then((res) => {
this.useroptions = res;
});
},
//作业 //作业
//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情 //根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情

2
src/views/opm/operation.vue
View File

@ -101,7 +101,7 @@ export default {
20: "审批中", 20: "审批中",
30: "待作业", 30: "待作业",
40: "作业中", 40: "作业中",
50: "已关闭", 50: "已结束",
}, },
userId: '', userId: '',
}; };

8
src/views/opm/operation_form.vue
View File

@ -194,7 +194,6 @@ export default {
mounted() { mounted() {
this.getDept(); this.getDept();
this.getArea(); this.getArea();
// this.getUser();
}, },
methods: { methods: {
//所属部门,属地部门，业务部门 //所属部门,属地部门，业务部门
@ -224,13 +223,6 @@ export default {
this.vchannelOptions = res; this.vchannelOptions = res;
}); });
}, },
//业务部门协调员
// getUser() {
// this.$API.system.user.list.req({ page: 0 }).then((res) => {
// this.coordinatoroptions = res;
// });
// },
//显示 //显示
open(mode = "add") { open(mode = "add") {

26
src/views/sys/user_form.vue
View File

@ -184,13 +184,9 @@
getUserPostList(){ getUserPostList(){
debugger; debugger;
console.log(this.form.id); console.log(this.form.id);
let obj = {user:this.form.id}; let obj = {user:this.form.id, page:0};
this.$API.system.userPost.list.req(obj).then(res=>{ this.$API.system.userPost.list.req(obj).then(res=>{
if(res.err_msg){ this.userPostForm.list=res;
this.$message.error(res.err_msg)
}else{
this.userPostForm.list=res.results;
}
}) })
}, },
//新增用户岗位关系 //新增用户岗位关系
@ -200,13 +196,8 @@
this.isSaveing = true; this.isSaveing = true;
row.user = this.form.id; row.user = this.form.id;
this.$API.system.userPost.create.req(row).then(res=>{ this.$API.system.userPost.create.req(row).then(res=>{
if(res.err_msg){ this.getUserPostList();
this.$message.error(res.err_msg) this.$message.success("操作成功");
}else{
this.getUserPostList();
this.$message.success("操作成功");
// this.userPostForm.list=res.results;
}
}) })
}, },
//用户岗位关系删除 //用户岗位关系删除
@ -217,12 +208,9 @@
confirmButtonClass: 'el-button--danger' confirmButtonClass: 'el-button--danger'
}).then(() => { }).then(() => {
this.$API.system.userPost.delete.req(id).then(res=>{ this.$API.system.userPost.delete.req(id).then(res=>{
if(res.err_msg){ this.getUserPostList();
this.$message.error(res.err_msg) this.$message.success("操作成功");
}else{
this.getUserPostList();
this.$message.success("操作成功");
}
}) })
}) })
}, },

7
src/views/vm/visit_detial.vue
View File

@ -144,16 +144,9 @@ export default {
}; };
}, },
mounted() { mounted() {
// this.getUser();
}, },
methods: { methods: {
//访客接待人 //访客接待人
// getUser() {
// this.$API.system.user.list.req({ page: 0 }).then((res) => {
// this.receptionistoptions = res;
// });
// },
//显示 //显示
open(mode = "add") { open(mode = "add") {
this.mode = mode; this.mode = mode;

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

@ -291,7 +291,6 @@ export default {
mounted() { mounted() {
this.visitid = this.$route.query.visitid; //作业ID this.visitid = this.$route.query.visitid; //作业ID
this.getRpj(); this.getRpj();
// this.getUser();
this.getpeoplelistlist(); this.getpeoplelistlist();
this.getvisitorlist(); this.getvisitorlist();
}, },
@ -308,11 +307,6 @@ export default {
this.form.receptionist_name=data.name this.form.receptionist_name=data.name
}, },
//接待人 //接待人
// getUser() {
// this.$API.system.user.list.req({ page: 0 }).then((res) => {
// this.receptionistoptions = res;
// });
// },
//渲染工单提交按钮 //渲染工单提交按钮
getInit(){ getInit(){
this.$API.wf.workflow.initkey.req('visit').then((res) => { this.$API.wf.workflow.initkey.req('visit').then((res) => {