ljf
/
shuili-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 添加有害动物检查管理统计等页面

sy-water-data-board-ui
panyuyi 1 month ago
parent
65d0509178
commit
c0462b2ff2
9 changed files with 57 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/dike/runManage/patrolMaintenance/patrolItemsManage/details.vue
  2. 2
      src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue
  3. 18
      src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue
  4. 20
      src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/details.vue
  5. 36
      src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue
  6. 22
      src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
  7. 2
      src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/details.vue
  8. 2
      src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/index.vue
  9. 4
      vue.config.js

2
src/views/dike/runManage/patrolMaintenance/patrolItemsManage/details.vue
View File

@ -394,7 +394,7 @@ export default {
(v) => !v.content || !v.parts || !v.parts.length (v) => !v.content || !v.parts || !v.parts.length
) )
) { ) {
this.$message.error("请完善巡查部位或检车内容"); this.$message.error("请完善巡查部位或检查内容");
return; return;
} }
} else { } else {

2
src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue
View File

@ -135,7 +135,7 @@ export default {
<div class="table-box slider-right-body" ref="tableBoxRef"> <div class="table-box slider-right-body" ref="tableBoxRef">
<div class="" ref="topBoxRef"> <div class="" ref="topBoxRef">
<div class="top-search"> <div class="top-search">
<span>巡视检查名称：</span> <span>巡查名称：</span>
<el-input <el-input
class="search-input" class="search-input"
v-model="paramsData.name" v-model="paramsData.name"

18
src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue
View File

@ -4,7 +4,7 @@
<div class="slider-right-body"> <div class="slider-right-body">
<div class="top-search"> <div class="top-search">
<span class="ml-10">巡查周期：</span> <span class="ml-10">检查周期：</span>
<el-date-picker <el-date-picker
v-model="paramsData.timeRange" v-model="paramsData.timeRange"
size="small" size="small"
@ -36,25 +36,25 @@
<div class="content-box"> <div class="content-box">
<div class="sum-box-list"> <div class="sum-box-list">
<div class="list-item"> <div class="list-item">
<div class="item-title">巡查工程总数(个)</div> <div class="item-title">检查工程总数(个)</div>
<div class="item-value"> <div class="item-value">
{{ projectSum == null ? "-" : projectSum }} {{ projectSum == null ? "-" : projectSum }}
</div> </div>
</div> </div>
<div class="list-item"> <div class="list-item">
<div class="item-title">巡查记录总数(个)</div> <div class="item-title">检查记录总数(个)</div>
<div class="item-value"> <div class="item-value">
{{ xcRecordsSum == null ? "-" : xcRecordsSum }} {{ xcRecordsSum == null ? "-" : xcRecordsSum }}
</div> </div>
</div> </div>
<div class="list-item"> <div class="list-item">
<div class="item-title">巡查缺陷总数(个)</div> <div class="item-title">检查问题总数(个)</div>
<div class="item-value"> <div class="item-value">
{{ flawSum == null ? "-" : flawSum }} {{ flawSum == null ? "-" : flawSum }}
</div> </div>
</div> </div>
<div class="list-item"> <div class="list-item">
<div class="item-title">缺陷养护总数(个)</div> <div class="item-title">处置问题总数(个)</div>
<div class="item-value"> <div class="item-value">
{{ yhSum == null ? "-" : yhSum }} {{ yhSum == null ? "-" : yhSum }}
</div> </div>
@ -67,12 +67,12 @@
</div> </div>
<div class="echarts-box-list"> <div class="echarts-box-list">
<div class="title">巡查分析</div> <div class="title">检查分析</div>
<div class="echarts-box" ref="patrolEchart"></div> <div class="echarts-box" ref="patrolEchart"></div>
</div> </div>
<div class="echarts-box-list"> <div class="echarts-box-list">
<div class="title">缺陷和养护对比</div> <div class="title">问题和处置对比</div>
<div class="echarts-box" ref="compareEchart"></div> <div class="echarts-box" ref="compareEchart"></div>
</div> </div>
</div> </div>
@ -203,7 +203,7 @@ export default {
} }
} }
}); });
// 获取巡查分析数据 // 获取检查分析数据
this.renderEcharts({ this.renderEcharts({
group: "C_2", group: "C_2",
echartsInstanceName: "patrolEchartInstance", echartsInstanceName: "patrolEchartInstance",
@ -227,7 +227,7 @@ export default {
} }
} }
}); });
// 获取巡查分析数据 // 获取检查分析数据
this.renderEcharts({ this.renderEcharts({
group: "C_3", group: "C_3",
echartsInstanceName: "compareEchartInstance", echartsInstanceName: "compareEchartInstance",

20
src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/details.vue
View File

@ -1,4 +1,4 @@
<!-- 巡查项 --> <!-- 检查项 -->
<template> <template>
<div class="slider-right"> <div class="slider-right">
<TopBackTitle></TopBackTitle> <TopBackTitle></TopBackTitle>
@ -12,7 +12,7 @@
ref="ruleForm" ref="ruleForm"
label-width="120px" label-width="120px"
> >
<el-form-item label="巡查堤防名称" prop="dikeName"> <el-form-item label="堤防名称" prop="dikeName">
<el-select <el-select
:disabled="!canEdit" :disabled="!canEdit"
class="w-240" class="w-240"
@ -35,21 +35,21 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="巡查堤防编码" prop="dikeCode"> <el-form-item label="堤防编码" prop="dikeCode">
<el-input <el-input
v-model="formData.dikeCode" v-model="formData.dikeCode"
:disabled="true" :disabled="true"
placeholder="请选择堤防" placeholder="请选择堤防"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="巡查项目名称" prop="name"> <el-form-item label="有害动物防治项目名称" prop="name">
<el-input <el-input
v-model="formData.name" v-model="formData.name"
:disable="true" :disable="true"
placeholder="请输入" placeholder="请输入"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="巡查类别" prop="category"> <el-form-item label="检查防治类别" prop="category">
<el-select <el-select
:disabled="!canEdit" :disabled="!canEdit"
v-model="formData.category" v-model="formData.category"
@ -64,7 +64,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="巡查类型" prop="type"> <el-form-item label="检查类型" prop="type">
<el-select <el-select
:disabled="!canEdit" :disabled="!canEdit"
v-model="formData.type" v-model="formData.type"
@ -91,7 +91,7 @@
<div> <div>
<el-table :data="tableData" border> <el-table :data="tableData" border>
<el-table-column prop="parts" label="工程部位" width="320"> <el-table-column prop="parts" label="检查区域" width="320">
<template slot-scope="scope"> <template slot-scope="scope">
<el-cascader <el-cascader
:disabled="!canEdit" :disabled="!canEdit"
@ -220,7 +220,7 @@ export default {
}, },
}, },
created() { created() {
// 获取巡查类型 // 获取检查类型
this.getDicts("patrol_maintenance_type").then((res) => { this.getDicts("patrol_maintenance_type").then((res) => {
if (res.data && Array.isArray(res.data)) { if (res.data && Array.isArray(res.data)) {
this.xcTypeOptions = res.data; this.xcTypeOptions = res.data;
@ -394,11 +394,11 @@ export default {
(v) => !v.content || !v.parts || !v.parts.length (v) => !v.content || !v.parts || !v.parts.length
) )
) { ) {
this.$message.error("请完善巡查部位或检车内容"); this.$message.error("请完善检查区域或检查内容");
return; return;
} }
} else { } else {
this.$message.error("请至少新增一条巡查项目"); this.$message.error("请至少新增一条检查项目");
return; return;
} }
if (this.formData.id) { if (this.formData.id) {

36
src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue
View File

@ -1,4 +1,4 @@
<!-- 巡查项目管理 --> <!-- 防治项目管理 -->
<script> <script>
import { getDicts } from "@/api/management"; import { getDicts } from "@/api/management";
@ -59,7 +59,7 @@ export default {
this.pageData.pageNum = 1; this.pageData.pageNum = 1;
this.getTableData(); this.getTableData();
}, },
// 添加巡查项目 // 添加防治项目
handleAddItem() { handleAddItem() {
this.$router.push({ this.$router.push({
path: "patrolItemsDetails", path: "patrolItemsDetails",
@ -68,7 +68,7 @@ export default {
}, },
}); });
}, },
// 编辑巡查项目 // 编辑防治项目
handleOperateTableItem(row, mode) { handleOperateTableItem(row, mode) {
this.$router.push({ this.$router.push({
path: "patrolItemsDetails", path: "patrolItemsDetails",
@ -114,7 +114,7 @@ export default {
mounted() { mounted() {
// 获取列表数据 // 获取列表数据
this.getTableData(); this.getTableData();
// 获取巡查类型 // 获取防治类型
getDicts("patrol_maintenance_type").then((res) => { getDicts("patrol_maintenance_type").then((res) => {
if (res.data && Array.isArray(res.data)) { if (res.data && Array.isArray(res.data)) {
this.xcTypeOptions = res.data; this.xcTypeOptions = res.data;
@ -135,13 +135,13 @@ export default {
<div class="table-box slider-right-body" ref="tableBoxRef"> <div class="table-box slider-right-body" ref="tableBoxRef">
<div class="" ref="topBoxRef"> <div class="" ref="topBoxRef">
<div class="top-search"> <div class="top-search">
<span>巡视检查名称：</span> <span>防治项目名称：</span>
<el-input <el-input
class="search-input" class="search-input"
v-model="paramsData.name" v-model="paramsData.name"
placeholder="请输入巡视检查名称" placeholder="请输入巡视检查名称"
/> />
<span class="ml-10">巡查类型：</span> <span class="ml-10">检查类型：</span>
<el-select v-model="paramsData.type" placeholder="请选择"> <el-select v-model="paramsData.type" placeholder="请选择">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option <el-option
@ -151,7 +151,7 @@ export default {
:key="item.dictValue" :key="item.dictValue"
></el-option> ></el-option>
</el-select> </el-select>
<span class="ml-10">巡查类别：</span> <span class="ml-10">防治类别：</span>
<el-select v-model="paramsData.category" placeholder="请选择"> <el-select v-model="paramsData.category" placeholder="请选择">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option <el-option
@ -172,7 +172,7 @@ export default {
class="search-btn" class="search-btn"
style="float: right" style="float: right"
type="success" type="success"
v-hasPermi="['df:run:patrol:itemsmanage:item:add']" v-hasPermi="['df:run:pestanimal2:itemsmanage:item:add']"
@click="handleAddItem" @click="handleAddItem"
>添加</el-button >添加</el-button
> >
@ -183,13 +183,17 @@ export default {
</el-table-column> --> </el-table-column> -->
<el-table-column prop="id" align="center" label="单号" width="100"> <el-table-column prop="id" align="center" label="单号" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="name" align="center" label="巡查名称"> <el-table-column
prop="name"
align="center"
label="有害动物防治项目名称"
>
</el-table-column> </el-table-column>
<el-table-column prop="dikeName" align="center" label="工程名称"> <el-table-column prop="dikeName" align="center" label="工程名称">
</el-table-column> </el-table-column>
<el-table-column prop="dikeCode" align="center" label="工程代码"> <el-table-column prop="dikeCode" align="center" label="工程代码">
</el-table-column> </el-table-column>
<el-table-column align="center" label="巡查类型"> <el-table-column align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="xcTypeOptions.length > 0 && scope.row.type !== null">{{ <span v-if="xcTypeOptions.length > 0 && scope.row.type !== null">{{
xcTypeOptions.find((item) => item.dictValue == scope.row.type) xcTypeOptions.find((item) => item.dictValue == scope.row.type)
@ -197,7 +201,7 @@ export default {
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="巡查类别"> <el-table-column align="center" label="防治类别">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="xcCategoryOptions.length > 0 && scope.row.category !== null" v-if="xcCategoryOptions.length > 0 && scope.row.category !== null"
@ -233,7 +237,9 @@ export default {
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
style="margin-right: 16px" style="margin-right: 16px"
v-hasPermi="['df:run:patrol:itemsmanage:list:item:getInvoices']" v-hasPermi="[
'df:run:pestanimal2:itemsmanage:list:item:getInvoices',
]"
type="text" type="text"
size="small" size="small"
@click="handleGetInvoices(scope.row)" @click="handleGetInvoices(scope.row)"
@ -242,7 +248,7 @@ export default {
<el-button <el-button
style="margin-right: 16px" style="margin-right: 16px"
@click="handleOperateTableItem(scope.row, 'view')" @click="handleOperateTableItem(scope.row, 'view')"
v-hasPermi="['df:run:patrol:itemsmanage:list:item:check']" v-hasPermi="['df:run:pestanimal2:itemsmanage:list:item:check']"
type="text" type="text"
size="small" size="small"
>查看</el-button >查看</el-button
@ -250,7 +256,7 @@ export default {
<el-button <el-button
style="margin-right: 16px" style="margin-right: 16px"
@click="handleOperateTableItem(scope.row, 'edit')" @click="handleOperateTableItem(scope.row, 'edit')"
v-hasPermi="['df:run:patrol:itemsmanage:list:item:edit']" v-hasPermi="['df:run:pestanimal2:itemsmanage:list:item:edit']"
type="text" type="text"
size="small" size="small"
>编辑</el-button >编辑</el-button
@ -268,7 +274,7 @@ export default {
type="text" type="text"
size="small" size="small"
slot="reference" slot="reference"
v-hasPermi="['df:run:patrol:itemsmanage:list:item:delete']" v-hasPermi="['df:run:pestanimal2:itemsmanage:list:item:delete']"
>删除</el-button >删除</el-button
> >
</el-popconfirm> </el-popconfirm>

22
src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
View File

@ -4,7 +4,7 @@
<div class="slider-right-body"> <div class="slider-right-body">
<div class="top-search"> <div class="top-search">
<span class="ml-10">巡查周期：</span> <span class="ml-10">检查周期：</span>
<el-date-picker <el-date-picker
v-model="paramsData.timeRange" v-model="paramsData.timeRange"
size="small" size="small"
@ -47,25 +47,25 @@
<div class="content-box"> <div class="content-box">
<div class="sum-box-list"> <div class="sum-box-list">
<div class="list-item"> <div class="list-item">
<div class="item-title">巡查项目总数(个)</div> <div class="item-title">检查项目总数(个)</div>
<div class="item-value"> <div class="item-value">
{{ projectSum == null ? "-" : projectSum }} {{ projectSum == null ? "-" : projectSum }}
</div> </div>
</div> </div>
<div class="list-item"> <div class="list-item">
<div class="item-title">巡查记录总数(个)</div> <div class="item-title">检查记录总数(个)</div>
<div class="item-value"> <div class="item-value">
{{ xcRecordsSum == null ? "-" : xcRecordsSum }} {{ xcRecordsSum == null ? "-" : xcRecordsSum }}
</div> </div>
</div> </div>
<div class="list-item"> <div class="list-item">
<div class="item-title">巡查缺陷总数(个)</div> <div class="item-title">检查问题总数(个)</div>
<div class="item-value"> <div class="item-value">
{{ flawSum == null ? "-" : flawSum }} {{ flawSum == null ? "-" : flawSum }}
</div> </div>
</div> </div>
<div class="list-item"> <div class="list-item">
<div class="item-title">缺陷养护总数(个)</div> <div class="item-title">处置问题总数(个)</div>
<div class="item-value"> <div class="item-value">
{{ yhSum == null ? "-" : yhSum }} {{ yhSum == null ? "-" : yhSum }}
</div> </div>
@ -73,7 +73,7 @@
</div> </div>
<div class="echarts-box-list"> <div class="echarts-box-list">
<div class="title">巡查记录分析</div> <div class="title">检查记录分析</div>
<div class="flex"> <div class="flex">
<div <div
class="echarts-box echarts-box-left" class="echarts-box echarts-box-left"
@ -87,7 +87,7 @@
</div> </div>
<div class="echarts-box-list"> <div class="echarts-box-list">
<div class="title">巡查缺陷分析</div> <div class="title">检查问题分析</div>
<div class="flex"> <div class="flex">
<div <div
class="echarts-box echarts-box-left" class="echarts-box echarts-box-left"
@ -101,7 +101,7 @@
</div> </div>
<div class="echarts-box-list"> <div class="echarts-box-list">
<div class="title">缺陷问题等级分析</div> <div class="title">问题等级分析</div>
<div class="flex"> <div class="flex">
<div <div
class="echarts-box echarts-box-left" class="echarts-box echarts-box-left"
@ -115,7 +115,7 @@
</div> </div>
<div class="echarts-box-list"> <div class="echarts-box-list">
<div class="title">缺陷养护对比分析</div> <div class="title">问题处置对比分析</div>
<div class="flex"> <div class="flex">
<div <div
class="echarts-box echarts-box-left" class="echarts-box echarts-box-left"
@ -269,7 +269,7 @@ export default {
}, },
// 获取页面数据 // 获取页面数据
getTableData() { getTableData() {
// 巡查记录分析 // 检查记录分析
this.requestFunc({ group: "C_14" }).then((res) => { this.requestFunc({ group: "C_14" }).then((res) => {
if (res.data) { if (res.data) {
// 渲染图表和统计总数 // 渲染图表和统计总数
@ -353,7 +353,7 @@ export default {
}); });
} }
}); });
// 巡查缺陷分析 // 检查缺陷分析
this.requestFunc({ group: "C_15" }).then((res) => { this.requestFunc({ group: "C_15" }).then((res) => {
if (res.data) { if (res.data) {
if (res.data?.yaxis?.length) { if (res.data?.yaxis?.length) {

2
src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/details.vue
View File

@ -392,7 +392,7 @@ export default {
(v) => !v.content || !v.parts || !v.parts.length (v) => !v.content || !v.parts || !v.parts.length
) )
) { ) {
this.$message.error("请完善巡查部位或检车内容"); this.$message.error("请完善巡查部位或检查内容");
return; return;
} }
} else { } else {

2
src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/index.vue
View File

@ -135,7 +135,7 @@ export default {
<div class="table-box slider-right-body" ref="tableBoxRef"> <div class="table-box slider-right-body" ref="tableBoxRef">
<div class="" ref="topBoxRef"> <div class="" ref="topBoxRef">
<div class="top-search"> <div class="top-search">
<span>巡视检查名称：</span> <span>巡查名称：</span>
<el-input <el-input
class="search-input" class="search-input"
v-model="paramsData.name" v-model="paramsData.name"

4
vue.config.js
View File

@ -80,8 +80,8 @@ module.exports = {
changeOrigin: true, changeOrigin: true,
}, },
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: "http://shuili.product.dev.com:30115/", target: "http://shuili.product.dev.com:30115/",
target: "http://172.16.34.80:18082/", // target: "http://172.16.34.80:18082/",
// target: 'http://172.16.32.62:18888/', // target: 'http://172.16.32.62:18888/',
// target: "http://172.16.34.27:18082", // target: "http://172.16.34.27:18082",
changeOrigin: true, changeOrigin: true,

Write Preview
Loading…
Cancel
Save