diff --git a/src/api/model/em.js b/src/api/model/em.js
index d2fc2250..fe9d5c7e 100644
--- a/src/api/model/em.js
+++ b/src/api/model/em.js
@@ -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}/`);
+ }
+ },
+ },
}
\ No newline at end of file
diff --git a/src/config/route.js b/src/config/route.js
index 084599a1..e6d83942 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -79,6 +79,16 @@ const routes = [
},
"component": "userCenter"
},
+ {
+ "name": "events",
+ "path": "/events",
+ "meta": {
+ "title": "报警事件",
+ "icon": "el-icon-user",
+ "perms": ["userCenter"]
+ },
+ "component": "home/event"
+ },
]
},
//报表
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index cb8a7862..e465b031 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -177,23 +177,18 @@
-
+
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
+
diff --git a/src/views/em/equipmentc.vue b/src/views/em/equipmentc.vue
index 791deed3..7f0b9dc8 100644
--- a/src/views/em/equipmentc.vue
+++ b/src/views/em/equipmentc.vue
@@ -58,16 +58,17 @@
{{ scope.row.description }}
-
+
- 检验
+ 记录
+
-
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
@@ -139,9 +144,10 @@
@closed="visibleRecord=false"
>
+
+
+
+
+ 删除
+
+
+
@@ -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") {
diff --git a/src/views/home/event.vue b/src/views/home/event.vue
index af6aac2b..46af0179 100644
--- a/src/views/home/event.vue
+++ b/src/views/home/event.vue
@@ -18,26 +18,26 @@
-
+
-
+
-
+
-
+
-
+
{{ scope.row.parameter }}
@@ -58,10 +58,9 @@
{{ scope.row.keeper_name }}
-
- {{ scope.row.description }}
+
-
+