From 998b75f0d4aaed03001ec4246cd4f3b4b0743b7e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 23 Nov 2022 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/taskinfo/taskinfoPlan.vue | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/src/views/taskinfo/taskinfoPlan.vue b/src/views/taskinfo/taskinfoPlan.vue
index 492fabe..95f34ef 100644
--- a/src/views/taskinfo/taskinfoPlan.vue
+++ b/src/views/taskinfo/taskinfoPlan.vue
@@ -1,6 +1,6 @@
<template>
<basic-container>
- <avue-crud :option="option"
+ <avue-crud v-show="!isSetPlanUser&&!detailVisible" :option="option"
:table-loading="loading"
:data="data"
:page.sync="page"
@@ -11,6 +11,7 @@
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
+ @row-dblclick="rowClick"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -18,6 +19,9 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
+ <template slot="routeRangeForm">
+ <open-layers-map ref="OpenLayersMap" @toData="toData" :routeRange="form.routeRange"></open-layers-map>
+ </template>
<template slot="menuLeft">
<el-button type="danger"
size="small"
@@ -28,7 +32,7 @@
</el-button>
</template>
<template slot-scope="scope" slot="menu">
- <el-button style="margin-left:10px;" size="small" type="text" icon="el-icon-user" >设置巡检人</el-button>
+ <el-button style="margin-left:10px;" size="small" type="text" icon="el-icon-user" @click="goToTaskplanUser(scope.row.id)">设置巡检人</el-button>
</template>
<template slot-scope="{type,size,row,index}" slot="menuBtn">
<el-row style="width: 150px">
@@ -36,7 +40,7 @@
<!--divided 是一个划分线-->
<el-dropdown-item icon="el-icon-edit" :size="size" :type="type"
:disabled="row.state >= 1"
- @click.native="$refs.crud.rowEdit(row,index)">修 改</el-dropdown-item>
+ @click.native="$refs.crud.rowEdit(row,index)">编 辑</el-dropdown-item>
</el-col>
<el-col :span="12">
<el-dropdown-item icon="el-icon-delete" :size="size" :type="type"
@@ -46,29 +50,40 @@
<el-col :span="12">
<el-dropdown-item icon="el-icon-check" :size="size" :type="type" divided
:disabled="row.state >= 1"
- >启 用</el-dropdown-item>
+ @click.native="isChangeStatus(row.id,2)">启 用</el-dropdown-item>
</el-col>
<el-col :span="12">
<el-dropdown-item icon="el-icon-error" :size="size" :type="type" divided
:disabled="row.state >= 2"
- >停 用</el-dropdown-item>
+ @click.native="isChangeStatus(row.id,1)">停 用</el-dropdown-item>
</el-col>
</el-row>
</template>
</avue-crud>
+ <!--设置巡检人-->
+ <taskplan-user v-show="isSetPlanUser" ref="taskplanUser" @setPlanUser="setPlanUser"></taskplan-user>
+ <!--查看详情-->
+ <taskinfo-plan-detail v-if="detailVisible" ref="detailVisible" :detailInfo="detailInfo" @isDetail="isDetail"></taskinfo-plan-detail>
</basic-container>
</template>
+
+
<script>
- import {getList, getDetail, add, update, remove} from "@/api/taskinfo/taskinfoPlan";
+ import {getList, add, update, remove, changeStatus} from "@/api/taskinfo/taskinfoPlan";
import option from "@/const/taskinfo/taskinfoPlan";
import {mapGetters} from "vuex";
+ import TaskplanUser from "@/views/taskinfo/taskplanUser";
+ import OpenLayersMap from "@/components/OpenLayersMap/index";
+ import TaskinfoPlanDetail from "@/views/taskinfo/taskinfoPlanDetail";
export default {
+ components: {TaskinfoPlanDetail, TaskplanUser,OpenLayersMap},
data() {
return {
+ isSetPlanUser:false,
form: {},
query: {},
loading: true,
@@ -79,7 +94,9 @@
},
selectionList: [],
option: option,
- data: []
+ data: [],
+ detailVisible:false,
+ detailInfo:{},
};
},
computed: {
@@ -167,12 +184,10 @@
});
},
beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then(res => {
- this.form = res.data.data;
- });
- } else {
+ if (["add"].includes(type)) {
this.form.status = 2
+ }else if (["edit"].includes(type)) {
+ this.form.routeRange = '\'' + this.form.routeRange + '\''
}
done();
},
@@ -182,6 +197,11 @@
},
searchChange(params, done) {
this.query = params;
+ if (this.query.daterange){
+ this.query.startCreateTime = this.query.daterange[0]
+ this.query.endCreateTime = this.query.daterange[1]
+ this.query.daterange = null
+ }
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
@@ -211,6 +231,39 @@
this.loading = false;
this.selectionClear();
});
+ },
+ isChangeStatus(id,status) {
+ changeStatus(id,status).then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ })
+ },
+ goToTaskplanUser(planId) {
+ // this.$router.push({ path: "/taskinfo/taskplanUser", query: {planId:planId} });
+ var page = {
+ currentPage:1,
+ pageSize:this.page.pageSize
+ }
+ this.$refs.taskplanUser.onLoad(page,{planId:planId});
+ this.setPlanUser()
+ },
+ setPlanUser() {
+ this.isSetPlanUser = !this.isSetPlanUser
+ },
+ toData(toData) {
+ this.form.routeRange = toData
+ },
+ //点击当前行事件
+ rowClick(val){
+ this.detailInfo = val
+ this.isDetail();
+ },
+ isDetail(){
+ this.detailVisible = !this.detailVisible
}
}
};
--
Gitblit v1.9.3