许可证图片必填，首页添加在场人员列表
This commit is contained in:
parent
fc908b1803
commit
b028869736
|
|
@ -7,9 +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://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://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_BASEURL = http://127.0.0.1:8000
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,22 @@
|
|||
<span v-if="scope.row.employee_">{{ scope.row.employee_.belong_dept_name }}</span>
|
||||
</template>
|
||||
</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-pagination background
|
||||
:page-size="1000"
|
||||
|
|
|
|||
|
|
@ -1,23 +1,26 @@
|
|||
<template>
|
||||
<el-row :gutter="6">
|
||||
<el-col :md="10" :sm="24">
|
||||
<el-card shadow="hover">
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-card shadow="hover" style="">
|
||||
<template #header>
|
||||
<div class="card-header">
|
||||
<span>工单待办</span>
|
||||
</div>
|
||||
</template>
|
||||
<div class="card-body">
|
||||
<div v-for="item in dutyAgg" :key="item.workflow" style=" margin-bottom: 10px;">
|
||||
<div class="card-body" v-if="dutyAgg.length>0">
|
||||
<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-button icon="el-icon-promotion" type="primary" size="small" @click="toTicket"></el-button>
|
||||
</el-badge>
|
||||
<div class="workItemText">{{ item.workflow__name }}</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-col>
|
||||
<el-col :md="14" :sm="24">
|
||||
<el-col :md="16" :sm="24">
|
||||
<el-card shadow="hover">
|
||||
<template #header>
|
||||
<div class="card-header">
|
||||
|
|
@ -111,45 +114,7 @@ export default {
|
|||
};
|
||||
},
|
||||
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.getdutyAgg();
|
||||
},
|
||||
|
|
@ -241,10 +206,10 @@ export default {
|
|||
.card-body {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-around;
|
||||
height: 340px;
|
||||
overflow-y: scroll;
|
||||
padding-top: 10px;
|
||||
align-content:flex-start
|
||||
}
|
||||
|
||||
.workItemImg{
|
||||
|
|
|
|||
|
|
@ -164,7 +164,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -609,6 +610,9 @@
|
|||
measures_checked: [
|
||||
{required: true, message: '请选择'}
|
||||
],
|
||||
fileurl2:[
|
||||
{required: true, message: '请选择'}
|
||||
]
|
||||
}
|
||||
};
|
||||
},
|
||||
|
|
@ -720,11 +724,14 @@
|
|||
},
|
||||
//组件点击下一步
|
||||
handleNextStep() {
|
||||
|
||||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSaving = true; //如果是创建许可证书
|
||||
this.isSaving = true;
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
} //如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
// debugger;
|
||||
|
|
|
|||
|
|
@ -163,7 +163,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -721,7 +722,12 @@
|
|||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
this.issaving = true; //如果是创建许可证书
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
this.issaving = true;
|
||||
//如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
debugger;
|
||||
|
|
|
|||
|
|
@ -176,7 +176,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -735,6 +736,10 @@
|
|||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
this.issaving = true; //如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
|
|
|
|||
|
|
@ -172,7 +172,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -559,6 +560,10 @@
|
|||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
this.issave = true; //如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
|
|
|
|||
|
|
@ -172,7 +172,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -561,6 +562,10 @@
|
|||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
this.issave = true; //如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
|
|
|
|||
|
|
@ -137,7 +137,8 @@
|
|||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -541,6 +542,10 @@
|
|||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
this.issave = true;
|
||||
//如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
|
|
|
|||
|
|
@ -161,7 +161,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -540,10 +541,13 @@
|
|||
},
|
||||
//组件点击下一步
|
||||
handleNextStep() {
|
||||
|
||||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
this.issave = true; //如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
|
|
|
|||
|
|
@ -174,7 +174,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -565,6 +566,10 @@
|
|||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
this.issave = true; //如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
|
|
|
|||
|
|
@ -179,7 +179,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -743,6 +744,10 @@
|
|||
if (this.active == 0) {
|
||||
this.$refs.dialogForm.validate((valid) => {
|
||||
if (valid) {
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
this.issave = true; //如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
|
|
|
|||
|
|
@ -232,7 +232,8 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</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="作业前照片">
|
||||
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||
</el-form-item>
|
||||
|
|
@ -599,6 +600,10 @@ export default {
|
|||
//组件点击下一步
|
||||
handleNextStep() {
|
||||
if (this.active == 0) {
|
||||
if(this.form.create_imgs.length>0){}else{
|
||||
this.$message.error('请上传作业前照片');
|
||||
return;
|
||||
}
|
||||
//如果是创建许可证书
|
||||
if (this.oplId == "") {
|
||||
//基本信息提交
|
||||
|
|
|
|||
Loading…
Reference in New Issue