Browse Source

Merge branch 'release-sy-v1.0.0' into 'dev'

Release sy v1.0.0

See merge request project/water/shuili-vue!8
master_tdsql
黄星淮 1 year ago
parent
commit
0c5c93a2cf
  1. 43
      src/api/management/dike.js
  2. 11
      src/views/runManage/engineering/inspectionPlan/Dike.vue
  3. 11
      src/views/runManage/engineering/inspectionPlan/Sluice.vue
  4. 390
      src/views/runManage/pestAnimalControl/planManagement/Dike.vue

43
src/api/management/dike.js

@ -224,3 +224,46 @@ export function deleteDFMaintenanceRecords(id) {
method: 'delete'
})
}
// 害堤动物防治计划管理-防治计划列表
export function postDFPreventionControlPlanList(data) {
return request({
url: `/run/df/animal/plan/list`,
method: 'post',
data
})
}
// 害堤动物防治计划管理-新增防治计划
export function postDFNewPreventionControlPlan(data) {
return request({
url: `/run/df/animal/plan`,
method: 'post',
data
})
}
// 害堤动物防治计划管理-修改防治计划
export function putDFPreventionControlPlan(data) {
return request({
url: `/run/df/animal/plan`,
method: 'put',
data
})
}
// 害堤动物防治计划管理-防治计划详情
export function getDFPreventionControlPlan(id) {
return request({
url: `/run/df/animal/plan/${id}`,
method: 'get'
})
}
// 害堤动物防治计划管理-删除防治计划
export function deleteDFPreventionControlPlan(id) {
return request({
url: `/run/df/animal/plan/${id}`,
method: 'delete'
})
}

11
src/views/runManage/engineering/inspectionPlan/Dike.vue

@ -26,11 +26,11 @@ export default {
cycleType: '',
messageReminder: false,
reminderTime: '',
selectUser: [],
operators: [],
otherConfig: {
week: '',
time: ''
time: '',
selectUser: []
}
},
rules: {
@ -44,9 +44,6 @@ export default {
xcId: [
{ required: true, message: '请选择巡查项目名称', trigger: 'change' }
],
selectUser: [
{ required: true, message: '请选择巡查人员', trigger: 'change' }
],
cycleType: [
{ required: true, message: '请选择巡查周期', trigger: 'change' }
],
@ -56,7 +53,7 @@ export default {
reminderTime: [
{ required: true, message: '请选择提醒时间', trigger: 'change' }
],
operators: [
'otherConfig.selectUser': [
{ required: true, message: '请选择责任人', trigger: 'change' }
]
}
@ -344,7 +341,7 @@ export default {
<el-date-picker v-if="ruleForm.cycleType == 2 || ruleForm.type != 0" v-model="ruleForm.reminderTime"
value-format="yyyy-MM-dd hh:mm:ss" type="datetime" placeholder="选择日期时间" />
</el-form-item>
<el-form-item label-width="120px" label="责任人" prop="operators">
<el-form-item label-width="120px" label="责任人" prop="otherConfig.selectUser">
<el-select v-model="ruleForm.otherConfig.selectUser" multiple filterable remote :remote-method="searchUser"
value-key="id" placeholder="请输入关键词搜索用户" prop="selectUser">
<el-option v-for="item in personnelList" :key="item.id" :label="item.nickName" :value="item">

11
src/views/runManage/engineering/inspectionPlan/Sluice.vue

@ -26,11 +26,11 @@ export default {
cycleType: '',
messageReminder: false,
reminderTime: '',
selectUser: [],
operators: [],
otherConfig: {
week: '',
time: ''
time: '',
selectUser: []
}
},
rules: {
@ -44,9 +44,6 @@ export default {
xcId: [
{ required: true, message: '请选择巡查项目名称', trigger: 'change' }
],
selectUser: [
{ required: true, message: '请选择巡查人员', trigger: 'change' }
],
cycleType: [
{ required: true, message: '请选择巡查周期', trigger: 'change' }
],
@ -56,7 +53,7 @@ export default {
reminderTime: [
{ required: true, message: '请选择提醒时间', trigger: 'change' }
],
operators: [
'otherConfig.selectUser': [
{ required: true, message: '请选择责任人', trigger: 'change' }
]
}
@ -346,7 +343,7 @@ export default {
<el-date-picker v-if="ruleForm.cycleType == 2 || ruleForm.type != 0" v-model="ruleForm.reminderTime"
value-format="yyyy-MM-dd hh:mm:ss" type="datetime" placeholder="选择日期时间" />
</el-form-item>
<el-form-item label-width="120px" label="责任人" prop="otherConfig">
<el-form-item label-width="120px" label="责任人" prop="otherConfig.selectUser">
<el-select v-model="ruleForm.otherConfig.selectUser" multiple filterable remote :remote-method="searchUser"
value-key="id" placeholder="请输入关键词搜索用户" prop="selectUser">
<el-option v-for="item in personnelList" :key="item.id" :label="item.nickName" :value="item">

390
src/views/runManage/pestAnimalControl/planManagement/Dike.vue

@ -1,92 +1,22 @@
<!-- 害堤动物防护计划管理-堤防 -->
<script>
import { putDFMaintenancePlan, deleteDFMaintenancePlan, postDFMaintenancePlan, postDFMaintenancePlanList, getDFMaintenancePlan, listUser } from '@/api/management'
import { putDFMaintenancePlan, deleteDFMaintenancePlan, postDFNewPreventionControlPlan, postDFPreventionControlPlanList, getDFMaintenancePlan, listUser, getDicts } from '@/api/management'
export default {
name: 'InspectionItems',
data() {
return {
searchInput: '',
controlInput: '',
selectLevel: 1,
selectType: 3,
selectLevel: '',
selectType: '',
dialogVisible: false,
prohibitEditing: false,
personnelList: [], //
dikeLevel: [
{
id: 1,
label: '全部',
value: 1
},
{
id: 2,
label: '一级',
value: 2
},
{
id: 3,
label: '二级',
value: 3
},
{
id: 4,
label: '三级',
value: 4
},
{
id: 5,
label: '四级',
value: 5
},
{
id: 6,
label: '五级及以下',
value: 6
},
], //
embankmentList: [
{
label: '堤防1',
value: '1',
id: '1',
},
{
label: '堤防2',
value: '2',
id: '2',
},
{
label: '堤防3',
value: '3',
id: '3',
}
], //
controlType: [
{
id: 1,
label: '普查',
value: 0
},
{
id: 2,
label: '防治',
value: 1
},
{
id: 3,
label: '治理',
value: 2
}
],
patrolType: [], //
workMonth: [], //
dikeLevel: [], //
controlType: [], //
tableData: [], //
workTable: [
{
id: 1,
content: '对堤坝进行巡查,对发现的红火蚁巢穴、鼠洞及时处理并对鼠洞进行回填。',
date: '11月1日-11月30日',
weekday: '1',
}
], //
pageData: {
pageNum: 1, //
pageSize: 10, //
@ -96,15 +26,19 @@ export default {
ruleForm: {
dikeCode: '',
name: '',
planTime: 0,
nationalSupplement: '',
workMonth: '1月',
reminderCycle: '',
selectDate: 1,
selectUser: [],
messageReminder: false,
week: 1,
date: 1,
type: '',
instruction: '',
month: '',
details: [],
cycleType: '',
frequency: '',
operators: [],
isReminder: 1,
otherConfig: {
selectUser: [],
week: '',
day: ''
},
reminderTime: '',
},
rules: {
@ -112,24 +46,33 @@ export default {
{ required: true, message: '请选择堤防名称', trigger: 'blur' }
],
name: [
{ required: true, message: '请输入维养计划名称', trigger: 'blur' },
{ required: true, message: '请输入防治计划名称', trigger: 'blur' },
{ max: 100, message: '名称最长为100个字符', trigger: 'blur' }
],
planTime: [
{ required: true, message: '请选择计划名称', trigger: 'change' }
type: [
{ required: true, message: '请选择防治类型', trigger: 'change' }
],
nationalSupplement: [
{ required: true, message: '请输入资金', trigger: 'change' }
instruction: [
{ required: true, message: '请输入防治说明', trigger: 'change' }
],
workMonth: [
{ required: true, message: '请输入资金', trigger: 'change' }
month: [
{ required: true, message: '请选择工作月份', trigger: 'change' }
],
reminderCycle: [
cycleType: [
{ required: true, message: '请选择提醒日期', trigger: 'change' }
],
selectUser: [
frequency: [
{ required: true, message: '请输入次数', trigger: 'change' }
],
'otherConfig.selectUser': [
{ required: true, message: '请选择责任人', trigger: 'change' }
],
'otherConfig.week': [
{ required: true, message: '请选择星期', trigger: 'change' }
],
'otherConfig.day': [
{ required: true, message: '请输入', trigger: 'change' }
],
reminderTime: [
{ required: true, message: '请选择提醒时间', trigger: 'change' }
],
@ -144,6 +87,26 @@ export default {
}
},
methods: {
//
openAddDialog() {
//
getDicts('xc_w_month').then((res) => {
this.workMonth = res.data
console.log('🏝️this.workMonth🏝️', this.workMonth)
})
getDicts('xs_cycle_type').then((res) => {
this.patrolType = res.data
console.log('🏝️this.patrolType🏝️', this.patrolType)
})
if (this.ruleForm.details.length <= 0) {
this.ruleForm.details.push({
constructionDate: '',
jobContent: '',
planDays: 0
})
}
this.dialogVisible = true
},
//
deleteTableItem(row) {
deleteDFMaintenancePlan(row.id).then((res) => {
@ -185,7 +148,7 @@ export default {
getDFMaintenancePlan(row.id).then((res) => {
console.log('🚀res🚀', res)
this.ruleForm = res.data
this.ruleForm.reminderCycle = res.data.nationalSupplement + res.data.workMonth
this.ruleForm.reminderCycle = res.data.instruction + res.data.month
this.dialogVisible = true
})
},
@ -194,27 +157,37 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
console.log('🏝️this.ruleForm🏝️', this.ruleForm)
this.tableData.push(this.ruleForm)
this.ruleForm.cycleType = parseFloat(this.ruleForm.cycleType)
this.ruleForm.frequency = parseFloat(this.ruleForm.frequency)
this.ruleForm.month = parseFloat(this.ruleForm.month)
this.ruleForm.type = parseFloat(this.ruleForm.type)
this.ruleForm.otherConfig.selectUser.forEach((item) => {
this.ruleForm.operators.push({
name: item.userName,
uid: item.id
})
})
this.dialogVisible = false
// if (this.ruleForm.id) {
// putDFMaintenancePlan(this.ruleForm).then(() => {
// this.getTableData()
// this.dialogVisible = false
// this.$message({
// message: '',
// type: 'success'
// })
// })
// } else {
// postDFMaintenancePlan(this.ruleForm).then(() => {
// this.getTableData()
// this.dialogVisible = false
// this.$message({
// message: '',
// type: 'success'
// })
// })
// }
if (this.ruleForm.id) {
putDFMaintenancePlan(this.ruleForm).then(() => {
this.getTableData()
this.dialogVisible = false
this.$message({
message: '保存成功',
type: 'success'
})
})
} else {
postDFNewPreventionControlPlan(this.ruleForm).then(() => {
console.log('保存成功');
this.getTableData()
this.dialogVisible = false
this.$message({
message: '保存成功',
type: 'success'
})
})
}
} else {
console.log('校验不通过');
return false;
@ -226,7 +199,6 @@ export default {
this.$refs[formName].resetFields();
this.dialogVisible = false
},
// dialog
closeDialog(ruleForm = 'ruleForm') {
console.log('触发关闭dialog', ruleForm);
@ -234,45 +206,48 @@ export default {
this.ruleForm = {
dikeCode: '',
name: '',
planTime: '',
nationalSupplement: 0,
workMonth: 0,
location: '',
reminderCycle: 0,
content: '',
type: 0,
instruction: '',
month: '',
details: [],
cycleType: '',
isReminder: true,
selectUser: [],
week: 1,
date: 1,
reminderTime: '',
}
},
//
addWorkItem() {
this.workTable.push({
id: this.workTable.length + 1,
content: '',
date: '',
weekday: '',
this.ruleForm.details.push({
jobContent: '',
constructionDate: '',
planDays: '',
})
},
//
getTableData(value = '') {
// postDFMaintenancePlanList({
// data: {
// timeView: {
// timeField: "create_time"
// },
// },
// cv: {
// name: "name",
// type: "like",
// value
// },
// pageSize: this.pageData.pageSize,
// pageNum: this.pageData.pageNum
// }).then((res) => {
// if (res) {
// this.tableData = res.records
// this.pageData.total = res.total
// }
// console.log('🚀🚀', res)
// })
postDFPreventionControlPlanList({
data: {
timeView: {
timeField: "create_time"
},
},
cv: {
name: "name",
type: "like",
value
},
pageSize: this.pageData.pageSize,
pageNum: this.pageData.pageNum
}).then((res) => {
if (res) {
this.tableData = res.records
this.pageData.total = res.total
}
console.log('🚀表格数据🚀', res)
})
},
//
resetSearch() {
@ -283,7 +258,13 @@ export default {
},
mounted() {
//
this.getTableData()
// this.getTableData()
getDicts('dike_level').then((res) => {
this.dikeLevel = res.data
})
getDicts('dh_jh_type').then((res) => {
this.controlType = res.data
})
},
}
</script>
@ -301,25 +282,26 @@ export default {
<el-input class="search-input" v-model="controlInput" placeholder="请输入" />
<span>堤防级别</span>
<el-select v-model="selectLevel" placeholder="请选择">
<el-option v-for="item in dikeLevel" :label="item.label" :value="item.value" :key="item.id" />
<el-option label="全部" value="0" />
<el-option v-for="item in dikeLevel" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
</el-select>
<span style="margin-left: 10px;">防治类型</span>
<el-select v-model="selectType" placeholder="请选择">
<el-option label="全部" :value="3" />
<el-option v-for="item in controlType" :label="item.label" :value="item.value" :key="item.id" />
<el-option label="全部" value="3" />
<el-option v-for="item in controlType" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
</el-select>
<el-button class="search-btn" type="success" @click="getTableData(searchInput)">搜索</el-button>
<el-button @click="resetSearch()">重置</el-button>
</div>
<el-button class="search-btn" style=" margin-right: 16px;margin-bottom: 8px; float: right;" type="success"
@click="dialogVisible = true">添加</el-button>
@click="openAddDialog()">添加</el-button>
<el-table class="table" height="640" :data="tableData" border>
<el-table-column type="index" align="center" label="序号" width="100" />
<el-table-column prop="name" align="center" label="防治计划名称" />
<el-table-column prop="dikeCode" align="center" label="防治堤防" />
<el-table-column prop="dikeCode" align="center" label="堤防名称" />
<el-table-column prop="location" align="center" label="堤防级别" />
<el-table-column prop="content" align="center" label="堤防类型" />
<el-table-column prop="nationalSupplement" align="center" label="防治类型" />
<el-table-column prop="type" align="center" label="防治类型" />
<el-table-column prop="createTime" align="center" sortable label="创建时间" />
<el-table-column prop="updateTime" align="center" sortable label="更新时间" />
<el-table-column prop="address" align="center" label="操作">
@ -344,8 +326,8 @@ export default {
<div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div>
<span style="font-weight: 600;">基础信息</span>
</div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" >
<el-form-item label-width="120px" label="防治堤防" prop="dikeCode">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
<el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
<el-input style="width: 202px;" v-model="ruleForm.dikeCode" placeholder="请输入" :disabled="prohibitEditing" />
<el-button button class="search-btn" type="success" size="small">详情</el-button>
<el-button button class="search-btn" type="success" size="small">打开地图</el-button>
@ -354,41 +336,40 @@ export default {
<el-form-item label-width="120px" label="防治计划名称" prop="name">
<el-input style="width: 202px;" v-model="ruleForm.name" placeholder="请输入" :disabled="prohibitEditing" />
</el-form-item>
<el-form-item label-width="120px" label="防治类型" prop="planTime">
<el-select v-model="ruleForm.planTime" placeholder="请输入" :disabled="prohibitEditing">
<el-option v-for="item in controlType" :key="item.id" :label="item.label" :value="item.value">
<el-form-item label-width="120px" label="防治类型" prop="type">
<el-select v-model="ruleForm.type" placeholder="请选择" :disabled="prohibitEditing">
<el-option v-for="item in controlType" :key="item.id" :label="item.dictLabel" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
</div>
<el-form-item label-width="120px" label="防治说明" prop="nationalSupplement">
<el-input v-model="ruleForm.nationalSupplement" type="textarea" placeholder=" 请输入"
:disabled="prohibitEditing" />
<el-form-item label-width="120px" label="防治说明" prop="instruction">
<el-input v-model="ruleForm.instruction" type="textarea" placeholder=" 请输入" :disabled="prohibitEditing" />
</el-form-item>
<div style="display: flex; margin-bottom: 16px;">
<div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div>
<span style="font-weight: 600;">工作内容</span>
</div>
<el-form-item label-width="120px" label="工作月份" prop="workMonth">
<el-select v-model="ruleForm.workMonth" placeholder="请输入" :disabled="prohibitEditing">
<el-option v-for="(item, index) in 12 " :label="(index + 1) + '月'" :value="item" />
<el-form-item label-width="120px" label="工作月份" prop="month">
<el-select v-model="ruleForm.month" placeholder="请选择" :disabled="prohibitEditing">
<el-option v-for="item in workMonth" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
</el-select>
</el-form-item>
<el-table style="margin-bottom: 22px;" max-height="330" :data="workTable" border>
<el-table style="margin-bottom: 22px;" max-height="330" :data="ruleForm.details" border>
<el-table-column type="index" align="center" label="序号" width="50" />
<el-table-column prop="content" align="center" label="工作内容">
<el-table-column prop="jobContent" align="center" label="工作内容">
<template slot-scope="scope">
<el-input v-model="scope.row.content" placeholder="请输入工作内容" />
<el-input v-model="scope.row.jobContent" placeholder="请输入工作内容" />
</template>
</el-table-column>
<el-table-column prop="date" align="center" label="施工日期">
<el-table-column prop="constructionDate" align="center" label="施工日期">
<template slot-scope="scope">
<el-input v-model="scope.row.date" placeholder="请输入施工日期" />
<el-input v-model="scope.row.constructionDate" placeholder="请输入施工日期" />
</template>
</el-table-column>
<el-table-column prop="weekday" align="center" label="计划工日" width="80">
<el-table-column prop="planDays" align="center" label="计划工日" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.weekday" placeholder="请输入计划工日" />
<el-input v-model="scope.row.planDays" placeholder="请输入计划工日" />
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="100">
@ -396,50 +377,59 @@ export default {
<el-button style=" margin-right: 9px;" type="text" size="small" @click="addWorkItem">添加</el-button>
<el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
title="确定删除吗?" @confirm="deleteWorkTableItem(scope.row.id)">
<el-button v-if="workTable.length > 1" style="color: red;" type="text" size="small"
<el-button v-if="ruleForm.details.length > 1" style="color: red;" type="text" size="small"
slot="reference">删除</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<div style="display: flex;">
<el-form-item label-width="120px" label="提醒周期" prop="reminderCycle">
<el-input style="width: 80px;" v-model="ruleForm.reminderCycle" />
<el-form-item label-width="120px" label="提醒周期" prop="frequency">
<el-input style="width: 90px;" v-model="ruleForm.frequency" placeholder="请输入" />
/
<el-select style="width: 80px;" v-model="ruleForm.selectDate" placeholder="请选择日期">
<el-option label="天" :value="0" />
<el-option label="周" :value="1" />
<el-option label="月" :value="2" />
</el-form-item>
<el-form-item label-width="10px" prop="cycleType">
<el-select style="width: 90px;" v-model="ruleForm.cycleType" placeholder="请选择">
<el-option v-for="item in patrolType" :label="item.dictLabel" :value="item.dictValue"
:key="item.id"></el-option>
</el-select> /
</el-form-item>
<el-form-item label-width="120px" label="责任人" prop="selectUser">
<el-select v-model="ruleForm.selectUser" multiple filterable remote :remote-method="searchUser" value-key="id"
placeholder="请输入关键词搜索用户" prop="selectUser">
<el-form-item label-width="100px" label="责任人" prop="otherConfig.selectUser">
<el-select v-model="ruleForm.otherConfig.selectUser" multiple filterable remote :remote-method="searchUser"
value-key="id" placeholder="请输入关键词搜索用户" prop="selectUser">
<el-option v-for=" item in personnelList " :key="item.id" :label="item.nickName" :value="item">
</el-option>
</el-select>
</el-form-item>
</div>
<div style="display: flex;">
<el-form-item label-width="120px" label="消息提醒" prop="messageReminder">
<el-switch v-model="ruleForm.messageReminder" active-color="#31a08e" inactive-color="#dcdfe6">
<el-form-item label-width="120px" label="消息提醒" prop="isReminder">
<el-switch v-model="ruleForm.isReminder" :active-value="1" :inactive-value="0" active-color="#31a08e"
inactive-color="#dcdfe6">
</el-switch>
</el-form-item>
<el-form-item v-if="ruleForm.messageReminder" label-width="120px" label="提醒时间" prop="reminderTime">
<el-radio-group v-if="ruleForm.selectDate == 1" style="margin-bottom: 16px;" v-model="ruleForm.week">
<el-radio :label="1">星期一</el-radio>
<el-radio :label="2">星期二</el-radio>
<el-radio :label="3">星期三</el-radio>
<el-radio :label="4">星期四</el-radio>
<el-radio :label="5">星期五</el-radio>
<el-radio :label="6">星期六</el-radio>
<el-radio :label="7">星期日</el-radio>
</el-radio-group>
<div v-if="ruleForm.selectDate == 2" style="margin-bottom: 16px;">每月<el-input style="width: 202px;"
v-model="ruleForm.date" />
</div>
<el-time-picker v-model="ruleForm.reminderTime" value-format="yyyy-MM-dd hh:mm:ss" placeholder="选择时间" />
</el-form-item>
<div style="display: flex;flex-direction: column;">
<el-form-item v-if="ruleForm.isReminder && ruleForm.cycleType === '1'" label-width="120px" label="提醒时间"
prop="otherConfig.week">
<el-radio-group v-model="ruleForm.otherConfig.week">
<el-radio :label="1">星期一</el-radio>
<el-radio :label="2">星期二</el-radio>
<el-radio :label="3">星期三</el-radio>
<el-radio :label="4">星期四</el-radio>
<el-radio :label="5">星期五</el-radio>
<el-radio :label="6">星期六</el-radio>
<el-radio :label="7">星期日</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="ruleForm.isReminder && ruleForm.cycleType === '0'" label-width="120px" label="提醒时间"
prop="otherConfig.day">
<div>每月<el-input style="width: 202px;" v-model="ruleForm.otherConfig.day" />
</div>
</el-form-item>
<el-form-item label-width="120px" :label="ruleForm.cycleType === '2' ? '提醒时间' : ''" prop="reminderTime">
<el-time-picker v-model="ruleForm.reminderTime" value-format="yyyy-MM-dd hh:mm:ss" placeholder="选择时间" />
</el-form-item>
</div>
</div>
</el-form>
<div slot="footer" class="dialog-footer">

Loading…
Cancel
Save