elink-star
/
epmet-work-pc
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

安全设备和隐患

V1.0
tianqian 3 years ago
parent
5d6e6919d5
commit
71645539c7
9 changed files with 95 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
  2. 10
      src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
  3. 31
      src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
  4. 5
      src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
  5. 19
      src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
  6. 25
      src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
  7. 27
      src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
  8. 6
      src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
  9. 21
      src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue

29
src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
View File

@ -26,14 +26,14 @@
</el-select>
</el-form-item>
<el-form-item label="场所规模" prop="scaleTotal">
<el-input-number
<el-input
v-model="formData.scaleTotal"
:disabled="disabled"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入可容纳人数"
></el-input-number>
></el-input>
</el-form-item>
<el-form-item label="所属组织" prop="gridId">
<el-select v-model="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
@ -146,6 +146,16 @@ export default {
},
data() {
let checkNum = (rule, value, callback) => {
if (!value) {
return callback(new Error('场所规模不能为空'));
}
setTimeout(() => {
if (!Number.isInteger(value)) {
callback(new Error('请输入数字值'));
}
}, 1000);
};
let checkMObile = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入手机号'));
@ -182,7 +192,7 @@ export default {
placeCategory: [{ required: true, message: '场所类别不能为空', trigger: 'bulr' }],
placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
scaleTotal: [{ required: true, validator: checkNum, trigger: 'bulr' }],
gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
personInCharge: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
@ -191,6 +201,7 @@ export default {
},
//地图
loading: false,
searchValue: '',
searchOptions: []
};
@ -230,10 +241,10 @@ export default {
},
//场所类型
async loadplaceType() {
const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
const url = '/sys/dict/data/dictlist';
let params = {
// agencyId: this.agencyId,
// purpose: 'query'
dictType: 'ic_enterprise_place_type'
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
@ -300,9 +311,11 @@ export default {
params = { ...this.formData };
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success('添加成功');
this.$message.success('操作成功');
this.resetData();
this.$emit('handleComfirm');
this.handleCancle();
// // this.resetData();
// this.$emit('handleComfirm');
} else if (code >= 8000) {
this.$message.error(msg);
}

10
src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
View File

@ -38,9 +38,7 @@
<el-form-item label="负责人" prop="personInCharge">
<el-input v-model="formData.personInCharge" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="mobile">
<el-input v-model="formData.mobile" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-row>
<el-col :span="24" align="right">
<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
@ -166,7 +164,8 @@ export default {
detailId: '',
detailData: {},
multipleSelection: [],
rowObj: {}
rowObj: {},
importLoading: false
};
},
components: { addForm },
@ -299,7 +298,8 @@ export default {
},
async del(id) {
const url = '/actual/base/enterprise/delete';
const { data, code, msg } = await requestPost(url, id);
let idsArr = [id];
const { data, code, msg } = await requestPost(url, idsArr);
if (code === 0) {
this.$message.success('删除成功！');
this.getTableData();

31
src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
View File

@ -8,7 +8,6 @@
<div class="m-table-item">
<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
<template slot-scope="scope">
<el-date-picker
@ -218,6 +217,7 @@ export default {
return agencyId && agencyId == this.$store.state.user.agencyId;
}
},
watch: {
id: {
handler(val) {
@ -232,8 +232,9 @@ export default {
},
created() {
console.log("id",this.id)
console.log('id', this.id);
this.getOptionStaff();
this.getList();
},
methods: {
@ -354,13 +355,13 @@ export default {
const url = `/actual/base/enterprise/addorupdate-patrol`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('保存成功');
row.isEdit = false;
this.isEdit = false;
this.btnType = 'cancle';
this.getList();
} else {
this.$message.error(msg);
}
},
@ -371,12 +372,12 @@ export default {
const url = `/actual/base/enterprise/addorupdate-patrol`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('保存成功');
row.isEdit = false;
this.isEdit = false;
this.getList();
} else {
this.$message.error(msg);
}
},
@ -385,30 +386,34 @@ export default {
const { data, code, msg } = await requestPost(url);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('删除成功');
this.getList();
} else {
this.$message.error(msg);
}
},
async getList() {
const url = `/actual/base/enterprise/patrollist/`;
console.log('this.id', this.id);
const params = {
enterpriseId: this.id
enterpriseId: this.id,
pageNo: 1,
pageSize: 10000
};
const url = `/actual/base/enterprise/patrollist/`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.tableData = res.data.list.map(item => {
this.tableData = data.list.map(item => {
this.computeImgShowList(item);
return {
...item,
isEdit: false
};
});
} else {
this.$message.error(msg);
}
}
}

5
src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
View File

@ -269,9 +269,10 @@ export default {
params = { ...this.formData };
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success('添加成功');
this.$message.success('操作成功');
this.resetData();
this.$emit('handleComfirm');
this.handleCancle();
} else if (code >= 8000) {
this.$message.error(msg);
}

19
src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
View File

@ -62,13 +62,7 @@
<el-table-column prop="principalName" align="center" width="110" label="负责人" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="contactNum" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="latestInspectResult" align="center" label="最新检查结果" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.latestResult === '0'">合格</span>
<span v-else-if="scope.row.latestResult === '1'">不合格</span>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="latestInspectResultName" align="center" label="最新检查结果" :show-overflow-tooltip="true"></el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="130">
<template slot-scope="scope">
<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
@ -122,9 +116,9 @@ export default {
formData: {
equipmentName: '',
equipmentCategoryCode: '',
principalName: '',
principalName: '',
contactNum: '',
address: '',
address: ''
},
pageType: 'list', // 列表list 新增add 处理dispose 详情info
gridList: [], //所属网格list--场所区域
@ -287,8 +281,9 @@ export default {
.catch(err => {});
},
async del(id) {
const url = '/actual/base/enterprise/delete';
const { data, code, msg } = await requestPost(url, id);
const url = `/actual/base/enterprise/delete`;
let idsArr = [id];
const { data, code, msg } = await requestPost(url, idsArr);
if (code === 0) {
this.$message.success('删除成功！');
this.getTableData();
@ -331,7 +326,7 @@ export default {
equipmentCategoryCode: '',
principalName: '',
contactNum: '',
address: '',
address: ''
};
this.pageNo = 1;
this.getTableData();

25
src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
View File

@ -232,8 +232,9 @@ export default {
},
created() {
console.log("id",this.id)
console.log('id', this.id);
this.getOptionStaff();
this.getList();
},
methods: {
@ -354,13 +355,13 @@ export default {
const url = `/actual/base/safetyEquipmentInspectRecord/save`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('保存成功');
row.isEdit = false;
this.isEdit = false;
this.btnType = 'cancle';
this.getList();
} else {
this.$message.error(msg);
}
},
@ -371,12 +372,12 @@ export default {
const url = `/actual/base/safetyEquipmentInspectRecord/update`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('保存成功');
row.isEdit = false;
this.isEdit = false;
this.getList();
} else {
this.$message.error(msg);
}
},
@ -385,30 +386,32 @@ export default {
const { data, code, msg } = await requestPost(url);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('删除成功');
this.getList();
} else {
this.$message.error(msg);
}
},
async getList() {
const params = {
equipmentId: this.id
equipmentId: this.id,
pageNo: 1,
pageSize: 10000
};
const url = `/actual/base/safetyEquipmentInspectRecord/page`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.tableData = res.data.list.map(item => {
this.tableData = data.list.map(item => {
this.computeImgShowList(item);
return {
...item,
isEdit: false
};
});
} else {
this.$message.error(msg);
}
}
}

27
src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
View File

@ -48,7 +48,7 @@
</el-upload>
</div>
<div class="div-content" v-if="pageType != 'add'">
<div class="div-content" v-if="pageType != 'add'">
<el-image
v-if="formData.imgList.length > 0"
style="width: 100px; height: 50px"
@ -58,11 +58,11 @@
></el-image>
</div>
</el-form-item>
<el-form-item label="处理情况" prop="handleState">
<!-- <el-form-item label="处理情况" prop="handleState">
<el-select v-model="formData.handleState" placeholder="请选择" size="small" clearable class="u-item-width-normal">
<el-option v-for="item in handleStateArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="上报人" prop="reportPerson">
<el-input v-model="formData.reportPerson" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
@ -197,14 +197,12 @@ export default {
remark: ''
},
dataRule: {
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
reportTime: [{ required: true, message: '上报时间不能为空', trigger: 'bulr' }],
dangerPlaceName: [{ required: true, message: '隐患场所不能为空', trigger: 'bulr' }],
dangerContent: [{ required: true, message: '隐患内容不能为空', trigger: 'bulr' }],
reportPerson: [{ required: true, message: '上报人不能为空', trigger: 'bulr' }],
mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
},
@ -222,7 +220,7 @@ export default {
this.user = this.$store.state.user;
this.agencyId = this.user.agencyId;
this.startLoading();
// this.loadGrid();
this.loadGrid();
// this.loadplaceType();
if (this.pageType != 'add') {
this.getDetail();
@ -301,9 +299,10 @@ export default {
params = { ...this.formData };
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success('添加成功');
this.$message.success('操作成功');
this.resetData();
this.$emit('handleComfirm');
this.handleCancle();
// // this.resetData();
} else if (code >= 8000) {
this.$message.error(msg);
}

6
src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
View File

@ -28,9 +28,9 @@
<el-input v-model="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="上报时间" prop="reportTime">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
</template>
<el-date-picker v-model="formData.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-row>
<el-col :span="24" align="right">

21
src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
View File

@ -22,7 +22,7 @@
<div v-else class="div-content">{{ scope.row.handleTime }}</div>
</template>
</el-table-column>
<el-table-column prop="handleState" label="处理结果" align="center" >
<el-table-column prop="handleState" label="处理结果" align="center">
<template slot-scope="scope">
<el-select v-if="scope.row.isEdit" v-model="scope.row.handleState" placeholder="请选择" class="input-width" size="small" clearable>
<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
@ -150,6 +150,7 @@ export default {
created() {
console.log('id', this.id);
this.getOptionStaff();
this.getList();
},
methods: {
@ -270,13 +271,13 @@ export default {
const url = `/actual/base/hiddenDangerRecord/saveProcess`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('保存成功');
row.isEdit = false;
this.isEdit = false;
this.btnType = 'cancle';
this.getList();
} else {
this.$message.error(msg);
}
},
@ -287,12 +288,12 @@ export default {
const url = `/actual/base/hiddenDangerRecord/updateProcess`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('保存成功');
row.isEdit = false;
this.isEdit = false;
this.getList();
} else {
this.$message.error(msg);
}
},
@ -301,10 +302,10 @@ export default {
const { data, code, msg } = await requestPost(url);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.$message.success('删除成功');
this.getList();
} else {
this.$message.error(msg);
}
},
@ -316,15 +317,15 @@ export default {
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
return this.$message.error(res.msg);
} else {
this.tableData = res.data.list.map(item => {
this.tableData = data.list.map(item => {
this.computeImgShowList(item);
return {
...item,
isEdit: false
};
});
} else {
this.$message.error(msg);
}
}
}

Write Preview
Loading…
Cancel
Save