diff --git a/src/api/objective/meet.js b/src/api/objective/meet.js new file mode 100644 index 0000000..982bbd0 --- /dev/null +++ b/src/api/objective/meet.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +export function listtask(params) { + return request({ + url: '/api/admin/meet/index', + method: 'get', + params:params + }) +} + +export function store(data) { + return request({ + url: '/api/admin/meet/store', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/admin/meet/save', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: '/api/admin/meet/destroy', + method: 'get', + params: { + id + } + }) +} + +export function get(id) { + return request({ + url: '/api/admin/meet/show', + method: 'get', + params: { + id + } + }) +} + diff --git a/src/api/site/equipment.js b/src/api/site/equipment.js index 313d766..48f000f 100644 --- a/src/api/site/equipment.js +++ b/src/api/site/equipment.js @@ -43,3 +43,11 @@ export function get(id) { } }) } + +export function maintains(data) { + return request({ + url: '/api/admin/equipment/maintains', + method: 'post', + data + }) +} diff --git a/src/api/site/health.js b/src/api/site/health.js new file mode 100644 index 0000000..d08ade3 --- /dev/null +++ b/src/api/site/health.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function listtask(params) { + return request({ + url: '/api/admin/health/index', + method: 'get', + params:params + }) +} + +export function store(data) { + return request({ + url: '/api/admin/health/store', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/admin/health/save', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: '/api/admin/health/destroy', + method: 'get', + params: { + id + } + }) +} + +export function get(id) { + return request({ + url: '/api/admin/health/show', + method: 'get', + params: { + id + } + }) +} diff --git a/src/views/objective/meet.vue b/src/views/objective/meet.vue new file mode 100644 index 0000000..2ec03bd --- /dev/null +++ b/src/views/objective/meet.vue @@ -0,0 +1,508 @@ + + + + + diff --git a/src/views/site/equipment.vue b/src/views/site/equipment.vue index 2588e6d..092fe7f 100644 --- a/src/views/site/equipment.vue +++ b/src/views/site/equipment.vue @@ -24,6 +24,8 @@ +
@@ -61,7 +63,7 @@ - @@ -88,7 +90,7 @@ - @@ -112,6 +114,33 @@ 确 定
+ +
+ + + + + + + + + + + + + + + + + + +
+
+ 取 消 + 确 定 +
+
@@ -128,7 +157,8 @@ store, del, get, - listtask + listtask, + maintains } from "../../api/site/equipment.js"; import { getparameteritem @@ -150,7 +180,8 @@ total: 0 }, tableHeight: 0, - dialogFormVisible: false, + dialogFormVisible: false, + dialogMainFormVisible: false, formLabelWidth: "120px", clientHeight: 0, form: { @@ -163,6 +194,13 @@ maintain_time: "", remark: "", file_list: "", + }, + mainForm:{ + maintain_name:"", + finish_time:"", + accept_person:"", + remark:"" + }, fileList: [], tableData: [], @@ -203,7 +241,26 @@ message: '请填写备注', trigger: 'blur' }], - }, + }, + mainrules: { + maintain_name: [{ + message: '请填写维保人', + trigger: 'blur' + }], + finish_time: [{ + message: '请选择维保完成时间', + trigger: 'blur' + }], + accept_person: [{ + message: '请填写验收人', + trigger: 'blur' + }], + remark: [{ + message: '请填写备注', + trigger: 'blur' + }], + }, + tableHeight: 900, searchFields: { KeyWord: "" @@ -329,12 +386,13 @@ let result = Object.assign(that.form, res); that.form = result; let _files = []; - for (var mod of result.risk_from_files) { + for (var mod of result.equipment_files) { let m = Object.assign({}, mod["files"]); m.name = mod["files"].original_name; _files.push(m); } - that.fileList = _files; + that.fileList = _files; + that.mainForm = result.maintains; }).catch(error => { //reject(error) }) @@ -347,6 +405,15 @@ that.info(obj); } else {} this.dialogFormVisible = true; + }, + editMain(obj) { + this.form = this.$options.data().form; + this.clientHeight = document.documentElement.clientHeight - 84 - 110; + if (obj) { + var that = this; + that.info(obj); + } else {} + this.dialogMainFormVisible = true; }, submitForm(formName) { var that = this; @@ -380,6 +447,28 @@ return false; } }); + }, + submitMainForm(formName) { + var that = this; + this.$refs[formName].validate((valid) => { + if (valid) { + if (that.form.id) { + that.mainForm.id = that.form.id; + maintains(that.mainForm).then(response => { + //console.log(response) + this.$Message.success('操作成功'); + that.load(); + that.dialogMainFormVisible = false; + }).catch(error => { + //reject(error) + }) + } + } else { + this.$Message.error('数据校验失败'); + console.log('error submit!!'); + return false; + } + }); }, handleRemove(file, fileList) { let listUrl = []; @@ -410,7 +499,8 @@ var that = this; that.fileList = []; this.$refs[formName].resetFields(); - that.dialogFormVisible = false; + that.dialogFormVisible = false; + that.dialogMainFormVisible = false; }, } } diff --git a/src/views/site/health.vue b/src/views/site/health.vue new file mode 100644 index 0000000..a4517fd --- /dev/null +++ b/src/views/site/health.vue @@ -0,0 +1,541 @@ + + + + +