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

fix:计量设备

This commit is contained in:
shijing 2023-09-06 15:48:15 +08:00
parent db8e04276e
commit b871efc464
5 changed files with 119 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/api/model/em.js
View File

@ -69,5 +69,30 @@ export default {
}
},
},
echeckrecord: {
list: {
name: "设备列表",
req: async function(data){
return await http.get(
`${config.API_URL}/em/echeckrecord/`,
data
);
}
},
create: {
name: "创建",
req: async function(data){
return await http.post(
`${config.API_URL}/em/echeckrecord/`,
data);
}
},
delete: {
name: "删除",
req: async function(id){
return await http.delete(
`${config.API_URL}/em/echeckrecord/${id}/`);
}
},
},
}

10
src/config/route.js
View File

@ -79,6 +79,16 @@ const routes = [
},
"component": "userCenter"
},
{
"name": "events",
"path": "/events",
"meta": {
"title": "报警事件",
"icon": "el-icon-user",
"perms": ["userCenter"]
},
"component": "home/event"
},
]
},
//报表

21
src/views/em/equipment_form.vue
View File

@ -177,23 +177,18 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="仪表类型">
<el-input v-model="form.model" placeholder="仪表类型"/>
<el-input v-model="form.meter_type" placeholder="仪表类型"/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="量范">
<el-input v-model="form.number" placeholder="量范"/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="出厂编号">
<el-input v-model="form.number" placeholder="出厂编号"/>
<el-input v-model="form.measurement_range" placeholder="量范"/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="启用日期">
<el-date-picker
v-model="form.buy_date"
v-model="form.use_date"
type="date"
placeholder="启用日期"
value-format="YYYY-MM-DD"
@ -203,18 +198,18 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="测量介质">
<el-input v-model="form.number" placeholder="测量介质"/>
<el-form-item label="出厂编号">
<el-input placeholder="出厂编号"/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="接液材质">
<el-input v-model="form.number" placeholder="接液材质"/>
<el-form-item label="测量介质">
<el-input placeholder="测量介质"/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="管理等级">
<el-input v-model="form.number" placeholder="管理等级"/>
<el-input v-model="form.management_level" placeholder="管理等级"/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">

95
src/views/em/equipmentc.vue
View File

@ -58,16 +58,17 @@
<el-table-column label="备注" show-overflow-tooltip>
<template #default="scope">{{ scope.row.description }}</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="left">
<el-table-column label="操作" fixed="right" align="center" width="160px">
<template #default="scope">
<el-link
type="primary"
v-if="scope.row.cycle!==null"
@click="table_edit(scope.row)"
@click="table_record (scope.row)"
v-auth="'equipment.update'"
>
检验
记录
</el-link>
<el-divider direction="vertical"></el-divider>
<el-link
type="primary"
@click="table_edit(scope.row)"
@ -94,27 +95,26 @@
:model="form"
>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="检定时间" prop="happen_time">
<el-col :md="12" :sm="24" prop="check_date">
<el-form-item label="检定时间">
<el-date-picker
v-model="form.happen_time"
type="datetime"
v-model="form.check_date"
type="date"
placeholder="检定时间"
value-format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD"
style="width:100%"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="鉴定单位" prop="title">
<el-input v-model="form.title" placeholder="鉴定单位" />
<el-form-item label="鉴定单位" prop="check_organization">
<el-input v-model="form.check_organization" placeholder="鉴定单位" />
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="检定结果" prop="cate">
<el-select style="width: 100%" v-model="form.cate" placeholder="检定结果">
<el-form-item label="检定结果" prop="result">
<el-select style="width: 100%" v-model="form.result" placeholder="检定结果">
<el-option
v-for="item in options"
:key="item.id"
@ -124,6 +124,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="备注">
<el-input v-model="form.note" placeholder="备注"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-footer>
@ -139,9 +144,10 @@
@closed="visibleRecord=false"
>
<el-container v-loading="loading">
<el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment.create'" style="position: absolute;z-index: 10;left: 110px;top: 16px;"></el-button>
<el-main style="padding: 0 20px 20px 20px">
<scTable
ref="table"
ref="drawer_table"
:apiObj="apiObj2"
row-key="id"
stripe
@ -158,6 +164,17 @@
</el-table-column>
<el-table-column label="鉴定单位" prop="production_date">
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="160px">
<template #default="scope">
<el-link
type="danger"
@click="record_del(scope.row)"
v-auth="'equipment.delete'"
>
删除
</el-link>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
@ -188,17 +205,17 @@ export default {
query: {
page:1,
page_size:20,
type:20
type:20,
},
apiObj2: this.$API.em.equipment.list,
apiObj2: this.$API.em.echeckrecord.list,
query2: {
page:1,
page_size:20,
type:20
equipment:''
},
visible:true,
visible:false,
isSaveing:false,
visibleRecord:true,
visibleRecord:false,
selection: [],
state_: {
10: '完好',
@ -207,18 +224,26 @@ export default {
40: '禁用',
},
options:[
{id:10,name: '完好'},
{id:20,name: '限用'},
{id:30,name: '在修'},
{id:40,name: '禁用'},
{id:10,name: '正常'},
{id:20,name: '异常'}
],
form:{},
rules: {
time: [{ required: true, message: "请选择检验时间" }],
check_date: [{ required: true, message: "请选择检验时间" }],
check_organization: [{ required: true, message: "请填写检定机构" }],
},
item:{},
};
},
methods: {
table_record(row){
this.item = row;
this.form.equipment = row.id;
this.query2.equipment = row.id;
this.$nextTick(()=>{
this.visibleRecord = true;
})
},
//添加
add() {
this.dialog.save = true;
@ -246,29 +271,41 @@ export default {
.req(row.id)
.then((res) => {
this.$message.success("删除成功");
return res;
this.$refs.table.refresh();
})
.catch((err) => {
return err;
});
},
//表单提交方法
//新增检验
record_create(){
this.visible = true;
},
//提交检验
submit() {
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
this.$API.em.equipment.create.req(this.form).then(res=>{
this.$API.em.echeckrecord.create.req(this.form).then(res=>{
this.visible = false;
this.isSaveing = false;
this.$message.success("操作成功");
this.$refs.table.refresh();
this.$refs.drawer_table.refresh();
}).catch(()=>{
this.visible = false;
this.isSaveing = false;
})
}
});
},
//删除检验
record_del(row) {
this.$API.em.echeckrecord.delete.req(row.id).then((res) => {
this.$message.success("删除成功");
this.$refs.drawer_table.refresh();
}).catch((err) => {
return err;
});
},
//本地更新数据
handleSaveSuccess(data, mode) {
if (mode == "add") {

19
src/views/home/event.vue
View File

@ -18,26 +18,26 @@
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:params="query"
:data="tableData"
>
<el-table-column type="index" width="50"/>
<el-table-column label="所属部门" prop="name" show-overflow-tooltip>
<el-table-column label="所属部门" prop="deptName" show-overflow-tooltip>
</el-table-column>
<el-table-column label="所属工段" prop="number">
<el-table-column label="所属工段" prop="mgroupName">
</el-table-column>
<el-table-column label="所在班组" prop="model">
<el-table-column label="所在班组" prop="teamName">
</el-table-column>
<el-table-column label="所在班次" prop="factory" show-overflow-tooltip>
<el-table-column label="所在班次" prop="shiftName" show-overflow-tooltip>
</el-table-column>
<el-table-column label="发生时间" prop="production_date">
</el-table-column>
<el-table-column label="发生类型" prop="buy_date">
</el-table-column>
<el-table-column label="状态">
<template #default="scope">
<!-- <template #default="scope">
<el-tag v-if="scope.row.state===10" type="success">
{{ state_[scope.row.state] }}
</el-tag>
@ -50,7 +50,7 @@
<el-tag v-else type="danger">
{{ state_[scope.row.state] }}
</el-tag>
</template>
</template> -->
</el-table-column>
<el-table-column label="是否处理" show-overflow-tooltip>
<template #default="scope">{{ scope.row.parameter }}</template>
@ -58,10 +58,9 @@
<el-table-column label="处理人">
<template #default="scope">{{ scope.row.keeper_name }}</template>
</el-table-column>
<el-table-column label="备注" show-overflow-tooltip>
<template #default="scope">{{ scope.row.description }}</template>
<el-table-column label="备注" show-overflow-tooltip prop="memo">
</el-table-column>
<el-table-column label="操作" fixed="right" align="left">
<el-table-column label="操作" fixed="right" align="left" width="100px">
<template #default="scope">
<el-link
type="primary"