Browse Source

Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

sy-water-data-board-ui
chenhaojie 1 year ago
parent
commit
449ad18003
  1. 9
      src/api/dike/index.js
  2. 47
      src/views/dike/runManage/enginerring/inspectionPlan/index.vue
  3. 13
      src/views/dike/runManage/enginerring/inspectionRecords/index.vue
  4. 11
      src/views/dike/runManage/enginerring/patrolManage/index.vue
  5. 22
      src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
  6. 1
      src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
  7. 11
      src/views/sluice/runManage/enginerring/inspectionItems/index.vue
  8. 49
      src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
  9. 11
      src/views/sluice/runManage/enginerring/inspectionRecords/index.vue
  10. 11
      src/views/sluice/runManage/enginerring/patrolManage/index.vue
  11. 1
      vue.config.js

9
src/api/dike/index.js

@ -28,6 +28,15 @@ export function getDikeYhPlanList(data) {
})
}
// 修改维养记录状态
export function updateDikeYhRecordStatus(data) {
return request({
url: `/run/df/yh/record/status`,
method: 'put',
data
})
}
// 获取维修养护记录列表
export function getDikeYhRecordList(data) {
return request({

47
src/views/dike/runManage/enginerring/inspectionPlan/index.vue

@ -81,6 +81,14 @@ export default {
},
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
editTableItem(row) {
getDFInspectionPlan(row.id).then((res) => {
@ -309,28 +317,30 @@ export default {
<div class="font-18 mb-12 font-700">
{{ $route.query.dikeName }}-巡查计划
</div>
<div class="top-search">
<span>计划名称</span>
<el-input
class="search-input"
v-model="searchInput"
placeholder="请输入计划名称"
/>
<div class="flex justify-between">
<div class="top-search">
<span>计划名称</span>
<el-input
class="search-input"
v-model="searchInput"
placeholder="请输入计划名称"
/>
<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="getTableData(searchInput)"
>搜索</el-button
@click="dialogVisible = true"
>添加</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
>
<el-table height="625" :data="tableData" border>
<el-table-column type="index" align="center" label="序号" width="100" />
<el-table-column prop="name" align="center" label="计划名称" />
@ -399,7 +409,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@size-change="(e) => handlePageSizeChange(e)"
@current-change="(e) => handleCurrentPageChange(e)"
>
</el-pagination>
</div>

13
src/views/dike/runManage/enginerring/inspectionRecords/index.vue

@ -16,6 +16,14 @@ export default {
};
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
// 线
routeSetting(row) {
this.$router.push({
@ -92,7 +100,7 @@ export default {
>
<el-button @click="resetSearch()">重置</el-button>
</div>
<el-table class="table" height="665" :data="tableData" border>
<el-table class="table" height="635" :data="tableData" border>
<el-table-column type="index" align="center" label="序号" width="100" />
<el-table-column prop="name" align="center" label="巡检记录" />
<el-table-column align="center" label="有无异常">
@ -130,7 +138,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@size-change="(e) => handlePageSizeChange(e)"
@current-change="(e) => handleCurrentPageChange(e)"
>
</el-pagination>
</div>

11
src/views/dike/runManage/enginerring/patrolManage/index.vue

@ -76,7 +76,8 @@
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>
@ -242,6 +243,14 @@ export default {
this.getTableData();
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
getTableData() {
getDikeProjectList({

22
src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@ -11,7 +11,7 @@ import {
listUser,
} from "@/api/management";
import { getDikeYhRecordList } from "@/api/dike";
import { getDikeYhRecordList, updateDikeYhRecordStatus } from "@/api/dike";
export default {
name: "InspectionItems",
data() {
@ -53,7 +53,7 @@ export default {
selectUser: [],
implement: "",
remark: "",
status: 0,
status: "0",
},
rules: {
planId: [
@ -133,8 +133,16 @@ export default {
this.dialogVisible = true;
});
},
//
confirmPlanDetails(row) {},
//
confirmPlanDetails(row) {
updateDikeYhRecordStatus({
id: row.id,
status: "1",
}).then(() => {
this.getTableData();
this.$message.success("确认成功");
});
},
resetForm() {
this.$refs.ruleForm.resetFields();
this.dialogVisible = false;
@ -154,7 +162,7 @@ export default {
console.log("🚀user🚀", user);
this.ruleForm.operators = user;
if (confirm) {
this.ruleForm.status = 1;
this.ruleForm.status = "1";
}
this.ruleForm.maintenanceFunds = Number(
this.ruleForm.maintenanceFunds
@ -321,6 +329,7 @@ export default {
class="w-360"
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd 00:00:00"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
@ -331,6 +340,7 @@ export default {
type="daterange"
class="w-360"
range-separator="至"
value-format="yyyy-MM-dd 00:00:00"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
@ -669,7 +679,7 @@ export default {
>保存</el-button
>
<el-button
v-if="this.ruleForm.status == 0 && prohibitEditing"
v-if="this.ruleForm.status == '0' && prohibitEditing"
size="mini"
type="primary"
@click="submitForm('ruleForm', true)"

1
src/views/dike/runManage/pestAnimalControl/planManagement/index.vue

@ -565,6 +565,7 @@ export default {
<el-date-picker
v-model="ruleForm.planTime"
type="month"
value-format="yyyy-MM"
placeholder="选择日期"
>
</el-date-picker>

11
src/views/sluice/runManage/enginerring/inspectionItems/index.vue

@ -47,6 +47,14 @@ export default {
};
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
searchTableList() {
postSZInspectionProjectList({
@ -316,7 +324,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>

49
src/views/sluice/runManage/enginerring/inspectionPlan/index.vue

@ -81,6 +81,14 @@ export default {
},
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
editTableItem(row) {
getSZInspectionPlan(row.id).then((res) => {
@ -325,29 +333,31 @@ export default {
<div class="font-18 mb-12 font-700">
{{ $route.query.wagaName }}-巡查计划
</div>
<div class="top-search">
<span>计划名称</span>
<el-input
class="search-input"
v-model="searchInput"
placeholder="请输入计划名称"
/>
<div class="flex justify-between">
<div class="top-search">
<span>计划名称</span>
<el-input
class="search-input"
v-model="searchInput"
placeholder="请输入计划名称"
/>
<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="getTableData(searchInput)"
>搜索</el-button
@click="dialogVisible = true"
>添加</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
>
<el-table height="575" :data="tableData" border>
<el-table height="625" :data="tableData" border>
<el-table-column type="index" align="center" label="序号" width="100" />
<el-table-column prop="name" align="center" label="计划名称" />
<el-table-column align="center" label="巡查类型">
@ -415,7 +425,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>

11
src/views/sluice/runManage/enginerring/inspectionRecords/index.vue

@ -16,6 +16,14 @@ export default {
};
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
// 线
routeSetting(row) {
this.$router.push({
@ -118,7 +126,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>

11
src/views/sluice/runManage/enginerring/patrolManage/index.vue

@ -76,7 +76,8 @@
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>
@ -242,6 +243,14 @@ export default {
this.getTableData();
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
getTableData() {
getSluiceProjectList({

1
vue.config.js

@ -35,7 +35,6 @@ module.exports = {
port: 80,
open: true,
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
// [process.env.VUE_APP_BASE_API + '/run/sz/superviseWay']: {
// target: "http://172.16.34.27:18082",
// changeOrigin: true,

Loading…
Cancel
Save