巡检任务

main
Dayu 12 months ago
parent 55da446de2
commit 364c415bb2
  1. 7
      src/api/inspection/inspectionresult.js
  2. 35
      src/views/inspection/inspectionresult.vue
  3. 144
      src/views/inspection/inspectiontasks.vue
  4. 529
      src/views/inspection/inspectiontasksDetail.vue

@ -32,11 +32,14 @@ export const remove = (ids) => {
})
}
export const add = (row) => {
export const add = (row, taskNo) => {
return request({
url: '/api/inspection/inspectionresult/submit',
method: 'post',
data: row
params:{
row,
taskNo,
}
})
}

@ -67,29 +67,29 @@
}]
},
{
label: "巡检任务主键",
prop: "inspectionRaskId",
label: "结果编码",
prop: "resultNo",
rules: [{
required: true,
message: "请输入巡检任务主键",
message: "请输入结果编码",
trigger: "blur"
}]
},
{
label: "任务执行开始时间",
prop: "executeStartDate",
label: "任务编码",
prop: "taskNo",
rules: [{
required: true,
message: "请输入任务执行开始时间",
message: "请输入任务编码",
trigger: "blur"
}]
},
{
label: "发生原因",
prop: "happenReason",
label: "任务执行开始时间",
prop: "executeStartDate",
rules: [{
required: true,
message: "请输入发生原因",
message: "请输入任务执行开始时间",
trigger: "blur"
}]
},
@ -111,15 +111,6 @@
trigger: "blur"
}]
},
{
label: "处理过程描述",
prop: "processDescription",
rules: [{
required: true,
message: "请输入处理过程描述",
trigger: "blur"
}]
},
{
label: "巡检报告",
prop: "inspectionReport",
@ -141,10 +132,10 @@
return this.permission['inspectionresult_col_' + v.prop]
})
return {
addBtn: this.vaildData(this.permission.inspectionresult_add, false),
viewBtn: this.vaildData(this.permission.inspectionresult_view, false),
delBtn: this.vaildData(this.permission.inspectionresult_delete, false),
editBtn: this.vaildData(this.permission.inspectionresult_edit, false)
addBtn: this.validData(this.permission.inspectionresult_add, false),
viewBtn: this.validData(this.permission.inspectionresult_view, false),
delBtn: this.validData(this.permission.inspectionresult_delete, false),
editBtn: this.validData(this.permission.inspectionresult_edit, false)
};
},
ids() {

@ -10,7 +10,6 @@
ref="crud"
:header-cell-class-name="headerClass"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@ -51,15 +50,31 @@
</template>
<template #menu="{row,index,size}">
<el-button @click="handleDetailSearch(row,index)" type="text">详情</el-button>
<el-button @click="resultAdd(row,index)" type="text">上传巡检结果</el-button>
<el-button @click="resultAdd()" type="text">上传巡检结果</el-button>
<el-button @click="rowDel(row)" type="text">删除</el-button>
</template>
</avue-crud>
<el-dialog title="上传处理结果"
append-to-body
:visible.sync="resultBox"
width="480px">
<avue-form :option="optionResult"
v-model="resultForm"
ref="resultForm"
:upload-after="uploadAfter">
</avue-form>
<span slot="footer" class="dialog-footer">
<el-button @click="resultBox = false"> </el-button>
<el-button type="primary"
@click="submitResult"> </el-button>
</span>
</el-dialog>
</basic-container>
</template>
<script>
import {getList, getDetail, add, remove, action, stop} from "@/api/inspection/inspectiontasks";
import {getList, getDetail, remove, action, stop} from "@/api/inspection/inspectiontasks";
import {add} from "@/api/inspection/inspectionresult";
import {mapGetters} from "vuex";
import {auditing, reject} from "@/api/leger/equipmentledger";
import expUtil from "@/util/exportUtil";
@ -72,6 +87,7 @@
query: {},
search:{},
loading: true,
resultBox: false,
page: {
pageSize: 10,
currentPage: 1,
@ -181,7 +197,7 @@
},
{
label: "巡检对象主键",
prop: "inspectionObjId",
prop: "objectNo",
hide: true,
rules: [{
required: true,
@ -191,7 +207,7 @@
},
{
label: "巡检路线主键",
prop: "inspectionRouteId",
prop: "routeNo",
hide: true,
rules: [{
required: true,
@ -201,7 +217,7 @@
},
{
label: "巡检计划主键",
prop: "inspectionPlanId",
prop: "planNo",
hide: true,
rules: [{
required: true,
@ -271,7 +287,66 @@
},
]
},
data: []
data: [],
resultForm: {},
optionResult: {
submitBtn: false,
emptyBtn: false,
column: [
{
label: "任务执行开始时间",
prop: "executeStartDate",
type: "date",
format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd",
span:22,
labelWidth: 150,
rules: [{
required: true,
message: "请输入任务执行开始时间",
trigger: "blur"
}]
},
{
label: "任务执行结束时间",
prop: "executeEndDate",
type: "date",
format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd",
span:22,
labelWidth: 150,
row: true,
rules: [{
required: true,
message: "请输入任务执行结束时间",
trigger: "blur"
}]
},
{
label: "处理结果",
prop: "inspectiontResult",
span:22,
row: true,
rules: [{
required: true,
message: "请输入巡检结果",
trigger: "blur"
}]
},
{
label: "巡检报告",
prop: "inspectionReport",
span:22,
type:"textarea",
row: true,
rules: [{
required: true,
message: "请输入处理过程描述",
trigger: "blur"
}]
},
]
}
};
},
computed: {
@ -296,19 +371,6 @@
}
},
methods: {
rowSave(row, done, loading) {
add(row).then(() => {
done();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}, error => {
window.console.log(error);
loading();
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
@ -335,7 +397,6 @@
});
},
handleDetailSearch(row) {
debugger
this.$router.push({
path: "/inspection/inspectiontasksDetail",
query: {
@ -344,14 +405,37 @@
},
});
},
resultAdd(row) {
this.$router.push({
path: "/inspection/inspectionresult",
query: {
frameMode:"add",
id: row.id
resultAdd() {
this.resultBox = true;
},
submitResult(row, done, loading) {
const form = this.$refs.resultForm;
form.validate((valid) => {
if (valid) {
add(this.resultForm,row.taskNo).then(() => {
this.resultBox = false;
this.resultForm.executeStartDate= '';
this.resultForm.executeEndDate= '';
this.resultForm.inspectiontResult= '';
this.resultForm.inspectionReport= '';
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}, error => {
window.console.log(error);
loading();
});
} else {
this.$message({
type: "warning",
message: "请输入必要信息!"
});
}
});
},
handleDelete() {
if (this.selectionList.length === 0) {
@ -428,6 +512,12 @@
expUtil.excelExport(`/api/inspection/inspectiontasks/export?daf-auth=${getToken()}`, this.search, ['station', 'taskStatus']);
});
},
uploadAfter(res, done, loading, column) {
window.console.log(column);
done();
this.resultBox = false;
this.refreshChange();
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {

@ -3,25 +3,26 @@
<avue-tabs :option="option"
@change="handleChange"></avue-tabs>
<span v-if="type.prop==='information'">
<avue-crud :option="information_option"
<avue-form :option="information_option"
v-model="information_form"
ref="information_from"
ref="information_form"
:class="frame_class">
</avue-crud>
</avue-form>
</span>
<span v-else-if="type.prop==='result'">
<avue-crud :data="parameters_data"
<span v-else-if="type.prop==='results'">
<div>
<avue-crud :data="results_data"
:table-loading="loading"
:option="optionParam"
:option="optionResults"
:permission="permissionList"
:before-open="beforeOpen"
:header-cell-class-name="headerClass"
v-model="parameters_form"
v-model="results_form"
ref="crud"
@row-del="parameters_rowDel"
@row-update="parameters_rowUpdate"
@row-save="parameters_rowSave">
@row-del="results_rowDel"
@row-update="results_rowUpdate">
</avue-crud>
</div>
</span>
<div class="container">
<span >
@ -30,25 +31,34 @@
@click="handleFormSubmit"
v-if="addUpdateShowButton">
确定</el-button>
<el-button type="primary"
size="small"
@click="seachToUpdate"
v-if="shouldShowButton">
修改</el-button>
</span>
</div>
</basic-container>
<!-- https://avuejs.com/form/form-rules.html#%E5%A4%96%E7%BD%AE%E9%AA%8C%E8%AF%81-->
</template>
<script>
import {getList, getDetail, add, update, remove} from "@/api/inspection/inspectiontasks";
import {mapGetters} from "vuex";
import {auditing, reject} from "@/api/leger/equipmentledger";
import expUtil from "@/util/exportUtil";
import {getToken} from "@/util/auth";
import {getList, getDetail, add, update, remove} from "@/api/inspection/inspectiontasks";
export default {
import {mapGetters} from "vuex";
import website from "@/config/website";
import {readonly} from "vue";
import {getToken} from "@/util/auth";
import request from "@/router/axios";
export default {
name: "inspectiontasksDetail",
data() {
data () {
return {
frame_class: '',
type: {},
shouldShowButton:{},
addUpdateShowButton:{},
readonlyForm:{},
document_form:{},
option: {
column: [{
label: '基本信息',
@ -63,19 +73,14 @@
column: [
{
label: "任务编号",
prop: "id",
span: 6,
maxlength: 20,
rules: [{
required: true,
message: "请输入主键",
trigger: "blur"
}]
prop: "taskNo",
span: 7,
disabled: true,
},
{
label: "任务名称",
prop: "taskName",
search: true,
span: 7,
rules: [{
required: true,
message: "请输入任务名称",
@ -85,7 +90,8 @@
{
label: "场站",
prop: "station",
search: true,
type: "select",
span: 7,
dicUrl: "/api/daf-system/dict/dictionary?code=station",
props: {
label: "dictValue",
@ -97,30 +103,10 @@
trigger: "blur"
}]
},
{
label: "任务生成日期",
prop: "taskStartDate",
search: true,
rules: [{
required: true,
message: "请输入任务生成日期",
trigger: "blur"
}]
},
{
label: "任务完成日期",
prop: "taskEndDate",
search: true,
rules: [{
required: true,
message: "请输入任务完成日期",
trigger: "blur"
}]
},
{
label: "责任人",
prop: "responsiblePerson",
search: true,
span: 7,
rules: [{
required: true,
message: "请输入责任人",
@ -128,254 +114,310 @@
}]
},
{
label: "状态",
prop: "taskStatus",
search: true,
label: "任务生成日期",
prop: "taskStartDate",
type: "date",
span: 7,
labelWidth: 120,
format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd",
rules: [{
required: true,
message: "请输入任务状态",
message: "请输入任务生成日期",
trigger: "blur"
}]
},
{
label: "取消原因",
prop: "cancelReason",
label: "任务完成日期",
prop: "taskEndDate",
type: "date",
span: 7,
labelWidth: 120,
format: 'yyyy年MM月dd日',
valueFormat: "yyyyMMdd",
rules: [{
required: true,
message: "请输入取消原因",
message: "请输入任务完成日期",
trigger: "blur"
}]
},
{
label: "巡检对象主键",
label: "对象编号",
prop: "inspectionObjId",
hide: true,
span: 7,
rules: [{
required: true,
message: "请输入巡检对象主键",
trigger: "blur"
}]
},
{
label: "巡检路线主键",
prop: "inspectionRouteId",
hide: true,
rules: [{
required: true,
message: "请输入巡检路线主键",
trigger: "blur"
}]
},
{
label: "巡检计划主键",
prop: "inspectionPlanId",
hide: true,
rules: [{
required: true,
message: "请输入巡检计划主键",
message: "请输入对象编号",
trigger: "blur"
}]
},
{
label: "对象名称",
prop: "objectName",
hide: true,
rules: [{
required: true,
message: "请输入对象名称",
trigger: "blur"
}]
span: 7,
disabled: true,
},
{
label: "对象类型",
prop: "objectType",
hide: true,
span: 7,
disabled: true,
},
{
label: "路线编号",
prop: "inspectionRouteId",
span: 7,
type: "select",
cascaderItem: ['routeName','routeType'],
dicUrl: "/api/inspection/inspectionRoute/getRouteList",
props: {
label: "routeNo",
value: "routeNo",
},
event: {
change: (val) => {
if (!val) return
if (val) {
request({
url: '/api/inspection/inspectionRoute/getDetailList',
method: 'get',
params: {
routeNo: val
}
}).then((res) => {
const routeName = this.findObject(this.information_option.column, "routeName");
routeName.value = res.data.data.routeName;
})
}
},
},
rules: [{
required: true,
message: "请输入对象类型",
message: "请输入路线编号",
trigger: "blur"
}]
},
{
label: "路线名称",
prop: "routeName",
hide: true,
rules: [{
required: true,
message: "请输入路线名称",
trigger: "blur"
}]
// dicUrl: "/api/inspection/inspectionRoute/getDetailList?routeNo={{key}}",
span: 7,
disabled: true,
// cascaderIndex: 0,
// props: {
// value: "routeName",
// },
},
{
label: "路线类型",
prop: "routeType",
hide: true,
span: 7,
disabled: true,
},
{
label: "计划编号",
prop: "inspectionPlanId",
span: 7,
rules: [{
required: true,
message: "请输入路线类型",
message: "请输入路线编号",
trigger: "blur"
}]
},
{
label: "计划名称",
prop: "planName",
hide: true,
rules: [{
required: true,
message: "请输入计划名称",
trigger: "blur"
}]
span: 7,
disabled: true,
},
{
label: "计划类型",
prop: "planType",
hide: true,
rules: [{
required: true,
message: "请输入计划类型",
trigger: "blur"
}]
span: 7,
disabled: true,
},
{
label: "取消原因",
prop: "cancelReason",
span: 7,
},
{
label: "状态",
prop: "taskStatus",
type: "select",
span: 7,
dicUrl: "/api/daf-system/dict/dictionary?code=task_status",
props: {
label: "dictValue",
value: "dictKey"
},
},
]
},
data: []
};
results_data: [],
optionResults: {
align: 'center',
menuAlign: 'center',
height: 'auto',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
tip: false,
border: true,
column: [
{
label: "结果编码",
prop: "resultNo",
},
{
label: "任务执行开始时间",
prop: "executeStartDate",
},
{
label: "任务执行结束时间",
prop: "executeEndDate",
},
{
label: "巡检结果",
prop: "inspectiontResult",
},
{
label: "巡检报告",
prop: "inspectionReport",
},
]
},
}
},
computed: {
...mapGetters(["permission"]),
permissionList() {
// this.option.column = this.option.column.filter(v => {
// return this.permission['inspectiontasks_col_' + v.prop]
// })
return {
addBtn: false,
viewBtn: false,
delBtn: false,
editBtn: false
delBtn: true,
editBtn: true
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
created () {
this.type = this.option.column[0];
if(this.$route.query.frameMode == "search"){
this.option.column.push({ label: '巡检结果', prop: 'results' });
this.readonlyForm=true;
this.shouldShowButton=true;
this.addUpdateShowButton=false;
this.frame_class = 'frame_class1';
}else{
const cancelReason = this.findObject(this.information_option.column, "cancelReason");
const taskStatus = this.findObject(this.information_option.column, "taskStatus");
cancelReason.display = false;
taskStatus.display = false;
this.readonlyForm=false;
this.shouldShowButton=false;
this.addUpdateShowButton=true;
this.frame_class = null;
}
this.SearchDetail();
},
methods: {
rowSave(row, done, loading) {
add(row).then(() => {
done();
this.onLoad(this.page);
handleFormSubmit() {
const form = this.$refs.information_form;
form.validate((valid) => {
if (valid) {
this.Submit();
} else {
this.$message({
type: "success",
message: "操作成功!"
type: "warning",
message: "请输入必要信息!"
});
}, error => {
window.console.log(error);
loading();
}
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
//
Submit() {
if(this.$route.query.frameMode=="add"){
this.$confirm("是否新增所填数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
}).then(() => {
add(this.information_form).then(()=>{
this.$router.push({
path: "/inspection/inspectiontasks",
query: {
},
});
this.$message({
type: "success",
message: "操作成功!"
});
}).catch((error) => {
this.$message({
type: "error",
message: "操作失败!"
});
},
handleDetailAdd() {
this.$router.push({
path: "/inspection/inspectiontasksDetail",
query: {
frameMode:"add"
},
});
},
handleDetailSearch(row) {
debugger
this.$router.push({
path: "/inspection/inspectiontasksDetail",
query: {
frameMode:"search",
id: row.id
},
});
},
resultAdd(row) {
this.$router.push({
path: "/inspection/inspectionresult",
query: {
frameMode:"add",
id: row.id
},
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
}else {
this.$confirm("是否修改所填数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
}).then(() => {
update(this.information_form).then(() => {
this.$router.push({
path: "/inspection/inspectiontasks",
query: {},
});
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
}).catch((error) => {
this.$message({
type: "error",
message: "操作失败!"
});
});
});
},
handleAction() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("是否将选择巡检任务启动?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return Action(this.ids);
})
.then(() => {
this.onLoad(this.page);
},
seachToUpdate () {
this.shouldShowButton=false;
this.addUpdateShowButton=true;
this.readonlyForm=false;
this.frame_class = null;
},
handleChange (column) {
this.type = column
},
//
results_rowUpdate (form, index, done, loading) {
update(form).then(() => {
done(form);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
}, error => {
window.console.log(error);
loading();
});
},
handleStop() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("是否将选择巡检任务停止?", {
//
results_rowDel (form, index,done) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return reject(this.ids);
return remove(form.id);
})
.then(() => {
this.onLoad(this.page);
@ -383,69 +425,60 @@
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
handleExport() {
this.$confirm("是否导出数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
expUtil.excelExport(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search, ['station', 'userStatus']);
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
SearchDetail() {
getDetail(this.$route.query.id).then(res => {
console.log(res);
this.information_form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage){
this.page.currentPage = currentPage;
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
headerClass(){
return 'header-class'
},
onLoad(page, params = {}) {
onLoad(row, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
getListBylegerId(this.$route.query.id).then(res => {
this.parameters_data = res.data.data;
this.loading = false;
this.selectionClear();
});
},
headerClass() {
return 'header-class'
}
}
};
}
</script>
<style>
.header-class{
background-color: #3366cc !important;
color: #FFFFFF !important;
}
.frame_class1 input.el-input__inner {
border: none;
box-shadow: none;
outline: none;
pointer-events: none;
}
.frame_class1 .el-input__icon {
display: none;
}
.frame_class1 .el-input--prefix .el-input__inner {
padding-left: 15px;
}
.container {
display: flex;
justify-content: flex-end; /* 将子元素推到容器的末端 */
}
.check_status_class {
display: flex;
justify-content: flex-end; /* 将子元素推到容器的末端 */
}
.check_status_class input.el-input__inner {
border: none;
box-shadow: none;
outline: none;
pointer-events: none;
}
</style>

Loading…
Cancel
Save