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

许可证图片必填，首页添加在场人员列表

This commit is contained in:
shijing 2023-05-09 10:59:47 +08:00
parent fc908b1803
commit b028869736
13 changed files with 180 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -7,9 +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://222.222.144.147:6013/api VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
#VUE_APP_API_BASEURL = http://10.99.5.79:20309/api #VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
VUE_APP_API_BASEURL = http://49.232.14.174:2226/api # VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
# VUE_APP_API_BASEURL = http://127.0.0.1:2226/api # VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
#VUE_APP_BASEURL = http://127.0.0.1:8000 #VUE_APP_BASEURL = http://127.0.0.1:8000

16
src/views/home/widgets/components/about.vue
View File

@ -13,6 +13,22 @@
<span v-if="scope.row.employee_">{{ scope.row.employee_.belong_dept_name }}</span> <span v-if="scope.row.employee_">{{ scope.row.employee_.belong_dept_name }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前位置">
<template #default="scope">
<div v-if="scope.row.employee_">
<span v-if="scope.row.employee_.location">
<span v-if="scope.row.employee_.location.area_fix_name">{{scope.row.employee_.location.area_fix_name }}</span>
<span v-else>厂区内</span>
</span>
</div>
</template>
</el-table-column>
<el-table-column label="MAC">
<template #default="scope">
<span v-if="scope.row.employee_">{{ scope.row.code }}</span>
</template>
</el-table-column>
</el-table> </el-table>
<el-pagination background <el-pagination background
:page-size="1000" :page-size="1000"

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

@ -1,23 +1,26 @@
<template> <template>
<el-row :gutter="6"> <el-row :gutter="6">
<el-col :md="10" :sm="24"> <el-col :md="8" :sm="24">
<el-card shadow="hover"> <el-card shadow="hover" style="">
<template #header> <template #header>
<div class="card-header"> <div class="card-header">
<span>工单待办</span> <span>工单待办</span>
</div> </div>
</template> </template>
<div class="card-body"> <div class="card-body" v-if="dutyAgg.length>0">
<div v-for="item in dutyAgg" :key="item.workflow" style=" margin-bottom: 10px;"> <div v-for="item in dutyAgg" :key="item.workflow" style="margin-bottom: 10px;height: fit-content;">
<el-badge :value="item.count" class="item workItemImg"> <el-badge :value="item.count" class="item workItemImg">
<el-button icon="el-icon-promotion" type="primary" size="small" @click="toTicket"></el-button> <el-button icon="el-icon-promotion" type="primary" size="small" @click="toTicket"></el-button>
</el-badge> </el-badge>
<div class="workItemText">{{ item.workflow__name }}</div> <div class="workItemText">{{ item.workflow__name }}</div>
</div> </div>
</div> </div>
<div class="card-body" v-else>
<div style="width:100%;line-height: 200px;color: #606266;text-align: center;">暂无待办工单</div>
</div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :md="14" :sm="24"> <el-col :md="16" :sm="24">
<el-card shadow="hover"> <el-card shadow="hover">
<template #header> <template #header>
<div class="card-header"> <div class="card-header">
@ -111,45 +114,7 @@ export default {
}; };
}, },
created() { created() {
var craeteTime = this.$TOOL.dateFormat(
new Date().toLocaleDateString(),
"yyyy-MM-dd"
);
this.postOptions = [];
this.$API.ecm.event.cateAgg
.req({ completed: false, start_create: craeteTime })
.then((res) => {
res.details.forEach((itemI, indexI) => {
this.postOptions.push({ value: itemI.count, name: itemI.cate__name });
});
});
this.option3 = {
title: {},
tooltip: {
trigger: "item",
},
legend: {
// orient: 'vertical',
left: 'center'
},
series: [
{
name: "事件分类",
type: "pie",
radius: ["40%", "70%"],
center: ["50%", "60%"],
label: {
formatter: '{c}',
position: 'inside',
color: 'white'
},
data: this.postOptions,
},
],
};
this.params.start_create = craeteTime;
this.apiObj = this.$API.ecm.event.list; this.apiObj = this.$API.ecm.event.list;
this.getdutyAgg(); this.getdutyAgg();
}, },
@ -241,10 +206,10 @@ export default {
.card-body { .card-body {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-around;
height: 340px; height: 340px;
overflow-y: scroll; overflow-y: scroll;
padding-top: 10px; padding-top: 10px;
align-content:flex-start
} }
.workItemImg{ .workItemImg{

13
src/views/opm/clear.vue
View File

@ -164,7 +164,8 @@
></el-input> ></el-input>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -609,6 +610,9 @@
measures_checked: [ measures_checked: [
{required: true, message: '请选择'} {required: true, message: '请选择'}
], ],
fileurl2:[
{required: true, message: '请选择'}
]
} }
}; };
}, },
@ -720,11 +724,14 @@
}, },
//组件点击下一步 //组件点击下一步
handleNextStep() { handleNextStep() {
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
this.isSaving = true; //如果是创建许可证书 this.isSaving = true;
if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
} //如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {
//基本信息提交 //基本信息提交
// debugger; // debugger;

10
src/views/opm/cooler.vue
View File

@ -163,7 +163,8 @@
></el-input> ></el-input>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -721,7 +722,12 @@
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
this.issaving = true; //如果是创建许可证书 if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
}
this.issaving = true;
//如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {
//基本信息提交 //基本信息提交
debugger; debugger;

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

@ -176,7 +176,8 @@
></el-input> ></el-input>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -735,6 +736,10 @@
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
}
this.issaving = true; //如果是创建许可证书 this.issaving = true; //如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {
//基本信息提交 //基本信息提交

63
src/views/opm/high.vue
View File

@ -172,7 +172,8 @@
></el-input> ></el-input>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -559,39 +560,43 @@
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
}
this.issave = true; //如果是创建许可证书 this.issave = true; //如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {
//基本信息提交 //基本信息提交
debugger; debugger;
this.form.cate = this.oplcateId; this.form.cate = this.oplcateId;
this.form.operation = this.operationId; this.form.operation = this.operationId;
console.log(this.form); console.log(this.form);
this.$API.opm.opl.create this.$API.opm.opl.create
.req(this.form) .req(this.form)
.then((res) => { .then((res) => {
this.$emit("success", this.form); this.$emit("success", this.form);
this.$message.success("创建成功"); this.$message.success("创建成功");
this.active = 1;
this.issave = false;
this.oplId = res.id;
this.getworkerList();
this.getgasList();
return res;
})
.catch((err) => {
this.issave = false;
return err;
});
} else if (this.oplId != "") {
this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
this.$message.success("基本修改成功！");
this.active = 1; this.active = 1;
this.issave = false; this.issave = false;
this.oplId = res.id;
this.getworkerList();
this.getgasList(); this.getgasList();
return res; this.getworkerList();
})
.catch((err) => {
this.issave = false;
return err;
});
} else if (this.oplId != "") {
this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
this.$message.success("基本修改成功！");
this.active = 1;
this.issave = false;
this.getgasList();
this.getworkerList();
}); });
} }
} }
}) })
} }

65
src/views/opm/hoisting.vue
View File

@ -172,7 +172,8 @@
></el-input> ></el-input>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -561,40 +562,44 @@
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
this.issave = true; //如果是创建许可证书 if(this.form.create_imgs.length>0){}else{
if (this.oplId == "") { this.$message.error('请上传作业前照片');
//基本信息提交 return;
debugger; }
this.form.cate = this.oplcateId; this.issave = true; //如果是创建许可证书
this.form.operation = this.operationId; if (this.oplId == "") {
console.log(this.form); //基本信息提交
this.$API.opm.opl.create debugger;
.req(this.form) this.form.cate = this.oplcateId;
.then((res) => { this.form.operation = this.operationId;
this.$emit("success", this.form); console.log(this.form);
this.$message.success("创建成功"); this.$API.opm.opl.create
.req(this.form)
.then((res) => {
this.$emit("success", this.form);
this.$message.success("创建成功");
this.active = 1;
this.issave = false;
this.oplId = res.id;
this.getworkerList();
this.getgasList();
return res;
})
.catch((err) => {
return err;
});
} else if (this.oplId != "") {
this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
this.$message.success("基本修改成功！");
this.active = 1; this.active = 1;
this.issave = false; this.issave = false;
this.oplId = res.id;
this.getworkerList();
this.getgasList(); this.getgasList();
return res; this.getworkerList();
})
.catch((err) => {
return err;
}); });
} else if (this.oplId != "") { } else {
this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
this.$message.success("基本修改成功！");
this.active = 1; this.active = 1;
this.issave = false; }
this.getgasList();
this.getworkerList();
});
} else {
this.active = 1;
}
} }
}) })
} }

7
src/views/opm/normal.vue
View File

@ -137,7 +137,8 @@
</el-checkbox-group> </el-checkbox-group>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -541,6 +542,10 @@
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
}
this.issave = true; this.issave = true;
//如果是创建许可证书 //如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {

64
src/views/opm/preheat.vue
View File

@ -161,7 +161,8 @@
></el-input> ></el-input>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -540,45 +541,48 @@
}, },
//组件点击下一步 //组件点击下一步
handleNextStep() { handleNextStep() {
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
}
this.issave = true; //如果是创建许可证书 this.issave = true; //如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {
//基本信息提交 //基本信息提交
this.form.cate = this.oplcateId; this.form.cate = this.oplcateId;
this.form.operation = this.operationId; this.form.operation = this.operationId;
console.log(this.form); console.log(this.form);
this.$API.opm.opl.create this.$API.opm.opl.create
.req(this.form) .req(this.form)
.then((res) => { .then((res) => {
this.$emit("success", this.form); this.$emit("success", this.form);
this.$message.success("创建成功"); this.$message.success("创建成功");
this.active = 1;
this.issave = false;
this.oplId = res.id;
this.getworkerList();
this.getgasList();
return res;
})
.catch((err) => {
this.issave = false;
return err;
});
} else if (this.oplId != "") {
this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
this.$message.success("基本修改成功！");
this.active = 1; this.active = 1;
this.issave = false; this.issave = false;
this.oplId = res.id;
this.getworkerList();
this.getgasList(); this.getgasList();
return res; this.getworkerList();
})
.catch((err) => {
this.issave = false;
return err;
}); });
} else if (this.oplId != "") { } else {
this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
this.$message.success("基本修改成功！");
this.active = 1; this.active = 1;
this.issave = false; this.issave = false;
this.getgasList(); }
this.getworkerList();
});
} else {
this.active = 1;
this.issave = false;
}
} }
}) })
} }

7
src/views/opm/soil.vue
View File

@ -174,7 +174,8 @@
></el-input> ></el-input>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -565,6 +566,10 @@
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
}
this.issave = true; //如果是创建许可证书 this.issave = true; //如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {
//基本信息提交 //基本信息提交

7
src/views/opm/space.vue
View File

@ -179,7 +179,8 @@
></el-input> ></el-input>
</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" style="position: relative;">
<span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片"> <el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
@ -743,6 +744,10 @@
if (this.active == 0) { if (this.active == 0) {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
}
this.issave = true; //如果是创建许可证书 this.issave = true; //如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {
//基本信息提交 //基本信息提交

9
src/views/opm/usecl.vue
View File

@ -232,8 +232,9 @@
></el-input> ></el-input>
</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" style="position: relative;">
<el-form-item label="作业前照片"> <span style="color:red;position: absolute;top: 8px;left: 18px;">*</span>
<el-form-item label="作业前照片">
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple> <sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -599,6 +600,10 @@ export default {
//组件点击下一步 //组件点击下一步
handleNextStep() { handleNextStep() {
if (this.active == 0) { if (this.active == 0) {
if(this.form.create_imgs.length>0){}else{
this.$message.error('请上传作业前照片');
return;
}
//如果是创建许可证书 //如果是创建许可证书
if (this.oplId == "") { if (this.oplId == "") {
//基本信息提交 //基本信息提交