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
panyuyi 1 month ago
parent
commit
0652edb981
  1. 27
      src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
  2. 22
      src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
  3. 39
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
  4. 4
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue
  5. 22
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
  6. 77
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
  7. 24
      src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
  8. 26
      src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue

27
src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue

@ -6,7 +6,7 @@
<div class="pb-16" ref="topBoxRef">
<div class="search-form flex flex-wrap" ref="searchFormRef">
<div class="search-item flex items-center">
<span class="search-label">巡查名称</span>
<span class="search-label">防治项目名称</span>
<el-input
clearable
size="small"
@ -18,7 +18,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查类型</span>
<span class="search-label">查类型</span>
<el-select
clearable
size="small"
@ -40,7 +40,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查时间</span>
<span class="search-label">查时间</span>
<el-date-picker
size="small"
class="ml-10"
@ -55,7 +55,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查责任人</span>
<span class="search-label">查责任人</span>
<el-input
clearable
size="small"
@ -67,7 +67,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查类别</span>
<span class="search-label">防控类别</span>
<el-select
clearable
size="small"
@ -89,7 +89,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查状态</span>
<span class="search-label">查状态</span>
<el-select
clearable
size="small"
@ -135,22 +135,25 @@
border
>
<el-table-column prop="id" align="center" label="单号"/>
<el-table-column prop="checkingName" align="center" label="巡查名称"/>
<el-table-column prop="type" align="center" label="巡查类型">
<el-table-column prop="checkingName" align="center" label="防治项目名称"/>
<el-table-column prop="dikeName" align="center" label="工程名称"/>
<el-table-column prop="dikeCode" align="center" label="工程代码"/>
<el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope">
<span>{{
getDictLabelName(scope.row.type, "maintenanceType")
}}</span>
</template>
</el-table-column>
<el-table-column prop="category" align="center" label="巡查类别">
<el-table-column prop="category" align="center" label="防治类别">
<template slot-scope="scope">
<span>{{
getDictLabelName(scope.row.category, "maintenanceCategory")
}}</span>
</template>
</el-table-column>
<el-table-column prop="status" align="center" label="查状态" width="100">
<el-table-column prop="status" align="center" label="查状态" width="100">
<template slot-scope="scope">
<span style="position: relative"
:style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}">
@ -174,11 +177,11 @@
</span>
</template>
</el-table-column>
<el-table-column prop="createName" align="center" label="责任人"/>
<el-table-column prop="createName" align="center" label="检查责任人"/>
<el-table-column
prop="startDate"
align="center"
label="查开始时间/结束时间"
label="查开始时间/结束时间"
>
<template slot-scope="scope">
<span

22
src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue

@ -6,7 +6,7 @@
<div class="pb-16" ref="topBoxRef">
<div class="search-form flex flex-wrap" ref="searchFormRef">
<div class="search-item flex items-center">
<span class="search-label">巡查名称</span>
<span class="search-label">防治项目名称</span>
<el-input
clearable
size="small"
@ -18,7 +18,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查类型</span>
<span class="search-label">查类型</span>
<el-select
clearable
size="small"
@ -40,7 +40,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查时间</span>
<span class="search-label">验收时间</span>
<el-date-picker
size="small"
class="ml-10"
@ -67,7 +67,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查类别</span>
<span class="search-label">防治类别</span>
<el-select
clearable
size="small"
@ -89,7 +89,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查状态</span>
<span class="search-label">验收状态</span>
<el-select
clearable
size="small"
@ -150,22 +150,24 @@
</div>
<el-table :height="tableHeight" :data="tableData" border>
<el-table-column prop="id" align="center" label="单号" />
<el-table-column prop="detail.name" align="center" label="巡查名称" />
<el-table-column align="center" label="巡查类型">
<el-table-column prop="detail.name" align="center" label="防治项目名称" />
<el-table-column prop="dikeName" align="center" label="工程名称"/>
<el-table-column prop="dikeCode" align="center" label="工程代码"/>
<el-table-column align="center" label="检查类型">
<template slot-scope="scope">
<span>{{
getDictLabelName(scope.row.detail.type, "maintenanceType")
}}</span>
</template>
</el-table-column>
<el-table-column prop="category" align="center" label="巡查类别">
<el-table-column prop="category" align="center" label="防治类别">
<template slot-scope="scope">
<span>{{
getDictLabelName(scope.row.detail.category || '', "maintenanceCategory")
}}</span>
</template>
</el-table-column>
<el-table-column prop="status" align="center" label="巡查状态" width="100">
<el-table-column prop="status" align="center" label="验收状态" width="100">
<template slot-scope="scope">
<span style="position: relative"
:style="['3', '5', '6'].includes(scope.row.detail.status) && {color: 'rgba(0,0,0,0.4)'}">
@ -197,7 +199,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column prop="detail.dutyHolderName" align="center" label="责任人" />
<el-table-column prop="detail.dutyHolderName" align="center" label="验收责任人" />
<el-table-column
prop="submitTime"
align="center"

39
src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue

@ -15,7 +15,7 @@
<div class="tc-text1">{{ form.createName }}</div>
</el-col>
<el-col :span="8">
<div class="tc-text2">巡查类别</div>
<div class="tc-text2">防治类别</div>
<div class="tc-text1">
{{getDictLabelName(form.category, "maintenanceCategory") }}
</div>
@ -25,7 +25,7 @@
<div class="tc-text1">{{ form.startDate }}/{{ form.endDate }}</div>
</el-col>
<el-col :span="8">
<div class="tc-text2">巡查部位</div>
<div class="tc-text2">检查区域</div>
<div class="tc-text1">{{ form.partsName }}</div>
</el-col>
<el-col :span="8">
@ -55,11 +55,11 @@
</el-col>
</el-row>
</div>
<div class="form-row-title">养护记录</div>
<div class="form-row-title">处置记录</div>
<el-form :model="form" :rules="rules" label-width="120px" label-position="top">
<el-row :gutter="48">
<el-col :span="8">
<el-form-item label="维养责任人:" prop="userName">
<el-form-item label="处置责任人:" prop="userName">
<el-input
disabled
placeholder="请输入内容"
@ -68,7 +68,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="维养开始/结束时间:" prop="time">
<el-form-item label="处置时间:" prop="time">
<el-date-picker
size="small"
class="ml-10"
@ -87,7 +87,7 @@
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="维养详情:" prop="describe">
<el-form-item label="处置详情:" prop="describe">
<el-input
type="textarea"
:rows="4"
@ -109,31 +109,6 @@
</el-image>
</el-form-item>
</el-form>
<el-table
:height="tableHeight"
:data="fileData"
style="margin-bottom: 16px;"
border
>
<el-table-column type="index" align="center" label="序号" />
<el-table-column prop="name" align="center" label="附件名称" />
<el-table-column prop="url" align="center" label="附件详情" />
<el-table-column align="center" label="操作" fixed="right" width="168">
<template slot-scope="scope">
<div style="display:flex;">
<el-button disabled size="small" style="margin-right: 10px;" type="text">上传</el-button>
<el-button
type="text"
size="small"
disabled
slot="reference"
v-hasPermi="['df:run:checking:item:delete']"
>删除</el-button
>
</div>
</template>
</el-table-column>
</el-table>
<div class="form-row-title">验收意见</div>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right">
<el-row :gutter="48">
@ -212,7 +187,6 @@ export default {
return {
entries: {},
traceList: [],
fileData: [],
maintenanceCategory: [],
maintenanceLevel: [],
tableData: [{
@ -316,7 +290,6 @@ export default {
this.form.userName = Yh.data.dutyHolderName
this.form.time = [...this.form.time]
this.form.images = Yh.data.doc.images
this.fileData = Yh.data.doc.docs
const ApprovalComment = await getV2ApprovalComment(this.$route.query.formId)
this.form.approvalTime = ApprovalComment.data[0].approvalTime
this.form.comment = ApprovalComment.data[0].comment

4
src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue

@ -15,7 +15,7 @@
<div class="tc-text1">{{ form.createName }}</div>
</el-col>
<el-col :span="8">
<div class="tc-text2">巡查类别</div>
<div class="tc-text2">防治类别</div>
<div class="tc-text1">
{{getDictLabelName(form.category, "maintenanceCategory") }}
</div>
@ -25,7 +25,7 @@
<div class="tc-text1">{{ form.startDate }}/{{ form.endDate }}</div>
</el-col>
<el-col :span="8">
<div class="tc-text2">巡查部位</div>
<div class="tc-text2">检查区域</div>
<div class="tc-text1">{{ form.partsName }}</div>
</el-col>
<el-col :span="8">

22
src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue

@ -2,7 +2,7 @@
<div class="slider-right">
<TopBackTitle></TopBackTitle>
<div class="table-box">
<div class="form-row-title">巡查路线</div>
<div class="form-row-title">检查信息</div>
<div class="patrol-box">
<el-form
ref="form"
@ -11,19 +11,19 @@
label-width="120px"
label-position="right"
>
<el-form-item label="巡查人:" prop="createName">
<el-form-item label="负责人:" prop="createName">
{{ form.createName }}
</el-form-item>
<el-form-item label="巡查项目名称:" prop="name">
<el-form-item label="防治项目名称:" prop="name">
{{ form.name }}
</el-form-item>
<el-form-item label="巡查堤防名称:" prop="dikeName">
{{ form.dikeName }}
</el-form-item>
<el-form-item label="巡查类别:" prop="category">
<el-form-item label="防治类别:" prop="category">
{{ getDictLabelName(form.category, "maintenanceCategory") }}
</el-form-item>
<el-form-item label="查时间:" prop="time">
<el-form-item label="查时间:" prop="time">
<el-date-picker
size="small"
class="ml-10"
@ -37,7 +37,7 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="查范围:" prop="scope">
<el-form-item label="查范围:" prop="scope">
<el-input
type="textarea"
:disabled="$route.query.mode === 'check'"
@ -60,7 +60,7 @@
></SyMixMap>
</div>
</div>
<div class="form-row-title">查项</div>
<div class="form-row-title">查项</div>
<el-table
:height="tableHeight"
@ -68,10 +68,10 @@
style="margin-bottom: 16px"
border
>
<el-table-column prop="name" align="center" label="巡查部位" />
<el-table-column prop="name" align="center" label="检查区域" />
<el-table-column prop="content" align="center" label="检查内容" />
</el-table>
<div class="form-row-title">缺陷问题列表</div>
<div class="form-row-title">有害动物防治检查列表</div>
<div
class="flex-1 flex justify-end search-item"
style="margin-bottom: 16px"
@ -102,7 +102,7 @@
border
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="itemId" label="巡查部位">
<el-table-column prop="itemId" label="检查区域">
<template slot-scope="scope">
<el-select
clearable
@ -162,7 +162,7 @@
></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="缺陷照片">
<el-table-column align="center" label="问题照片">
<template slot-scope="scope">
<div class="imgBox">
<div class="imgList" v-for="item in scope.row.problemImages">

77
src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue

@ -15,7 +15,7 @@
<div class="tc-text1">{{ form.createName }}</div>
</el-col>
<el-col :span="8">
<div class="tc-text2">巡查类别</div>
<div class="tc-text2">防治类别</div>
<div class="tc-text1">
{{getDictLabelName(form.category, "maintenanceCategory") }}
</div>
@ -25,7 +25,7 @@
<div class="tc-text1">{{ form.startDate }}/{{ form.endDate }}</div>
</el-col>
<el-col :span="8">
<div class="tc-text2">巡查部位</div>
<div class="tc-text2">检查区域</div>
<div class="tc-text1">{{ form.partsName }}</div>
</el-col>
<el-col :span="8">
@ -55,11 +55,11 @@
</el-col>
</el-row>
</div>
<div class="form-row-title">养护记录</div>
<div class="form-row-title">处置记录</div>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="top">
<el-row :gutter="48">
<el-col :span="8">
<el-form-item label="维养责任人:" prop="userName">
<el-form-item label="处置责任人:" prop="userName">
<el-input
disabled
placeholder="请输入内容"
@ -68,7 +68,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="维养开始/结束时间:" prop="time">
<el-form-item label="处置时间:" prop="time">
<el-date-picker
size="small"
class="ml-10"
@ -87,7 +87,7 @@
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="维养详情:" prop="describe">
<el-form-item label="处置详情:" prop="describe">
<el-input
type="textarea"
:rows="4"
@ -129,57 +129,6 @@
</el-image>
</el-form-item>
</el-form>
<el-table
:height="tableHeight"
:data="fileData"
style="margin-bottom: 16px;"
border
>
<el-table-column type="index" align="center" label="序号" />
<el-table-column prop="name" align="center" label="附件名称" />
<el-table-column prop="url" align="center" label="附件详情" />
<el-table-column align="center" label="操作" fixed="right" width="168">
<template slot-scope="scope">
<div style="display:flex;">
<el-upload
class=""
action="#"
:http-request="(e) => {handleUploadProject(e, scope.row)}"
:before-upload="(e) => {beforeUploadProject(e, scope.row)}"
:show-file-list="false"
accept=".png,.jpg,.jpeg"
>
<el-button
:disabled="$route.query.mode === 'check'"
size="small"
style="margin-right: 10px;"
type="text"
v-hasPermi="['df:run:patrol:maintenance:detail:item:upload']"
>上传</el-button>
</el-upload>
<el-popconfirm
confirm-button-text="确定"
cancel-button-text="取消"
icon="el-icon-info"
icon-color="red"
title="确定删除吗?"
@confirm="deleteTableItem(scope.row)"
>
<el-button
:style="$route.query.mode !== 'check' &&{color: 'red'}"
type="text"
size="small"
:disabled="$route.query.mode === 'check'"
slot="reference"
v-hasPermi="['df:run:patrol:maintenance:detail:item:del']"
>删除</el-button
>
</el-popconfirm>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="bottom-btns" v-if="$route.query.mode !== 'check'">
<el-button
@ -217,16 +166,6 @@ export default {
return {
entries: {},
traceList: [],
fileData: [
{
name: '工作票',
url: ''
},
{
name: '操作票',
url: ''
}
],
maintenanceCategory: [],
maintenanceLevel: [],
tableData: [{
@ -325,7 +264,6 @@ export default {
this.form.describe = ApprovalComment.data.content
this.form.time = [...this.form.time]
this.form.images = ApprovalComment.data.doc.images
this.fileData = ApprovalComment.data.doc.docs
}
},
getDictLabelName(type, dictListName) {
@ -418,8 +356,7 @@ export default {
problemId: this.$route.query.defectId,
recordId: this.$route.query.recordId,
doc: {
images: this.form.images,
docs: this.fileData,
images: this.form.images
},
startDate: this.form.time && this.form.time.length > 1 ? this.form.time[0] : '',
endDate: this.form.time && this.form.time.length > 1 ? this.form.time[1] : '',

24
src/views/dike/runManage/pestAnimalControl2/defectList/index.vue

@ -6,7 +6,7 @@
<div class="pb-16" ref="topBoxRef">
<div class="search-form flex flex-wrap" ref="searchFormRef">
<div class="search-item flex items-center">
<span class="search-label">巡查名称</span>
<span class="search-label">防治项目名称</span>
<el-input
clearable
size="small"
@ -18,7 +18,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查类型</span>
<span class="search-label">查类型</span>
<el-select
clearable
size="small"
@ -40,7 +40,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查时间</span>
<span class="search-label">查时间</span>
<el-date-picker
size="small"
class="ml-10"
@ -55,7 +55,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查责任人</span>
<span class="search-label">处置责任人</span>
<el-input
clearable
size="small"
@ -67,7 +67,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查类别</span>
<span class="search-label">防治类别</span>
<el-select
clearable
size="small"
@ -89,7 +89,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查状态</span>
<span class="search-label">查状态</span>
<el-select
clearable
size="small"
@ -154,15 +154,17 @@
border
>
<el-table-column prop="id" align="center" label="单号" />
<el-table-column prop="checkingName" align="center" label="巡查名称" />
<el-table-column prop="type" align="center" label="巡查类型">
<el-table-column prop="checkingName" align="center" label="防治项目名称" />
<el-table-column prop="dikeName" align="center" label="工程名称"/>
<el-table-column prop="dikeCode" align="center" label="工程代码"/>
<el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope">
<span>{{
getDictLabelName(scope.row.type, "maintenanceType")
}}</span>
</template>
</el-table-column>
<el-table-column prop="category" align="center" label="巡查类别">
<el-table-column prop="category" align="center" label="防治类别">
<template slot-scope="scope">
<span>{{
getDictLabelName(scope.row.category, "maintenanceCategory")
@ -176,11 +178,11 @@
}}</span>
</template>
</el-table-column>
<el-table-column prop="dutyHolderName" align="center" label="责任人" />
<el-table-column prop="dutyHolderName" align="center" label="处置责任人" />
<el-table-column
prop="startDate"
align="center"
label="查开始时间/结束时间"
label="查开始时间/结束时间"
>
<template slot-scope="scope">
<span

26
src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue

@ -6,7 +6,7 @@
<div class="pb-16" ref="topBoxRef">
<div class="search-form flex flex-wrap" ref="searchFormRef">
<div class="search-item flex items-center">
<span class="search-label">巡查名称</span>
<span class="search-label">防治项目名称</span>
<el-input
clearable
size="small"
@ -18,7 +18,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">查类型</span>
<span class="search-label">查类型</span>
<el-select
clearable
size="small"
@ -40,7 +40,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查时间</span>
<span class="search-label">处置时间</span>
<el-date-picker
size="small"
class="ml-10"
@ -55,7 +55,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查责任人</span>
<span class="search-label">处置责任人</span>
<el-input
clearable
size="small"
@ -67,7 +67,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查类别</span>
<span class="search-label">防治类别</span>
<el-select
clearable
size="small"
@ -89,7 +89,7 @@
</div>
<div class="search-item flex items-center">
<span class="search-label">巡查状态</span>
<span class="search-label">处置状态</span>
<el-select
clearable
size="small"
@ -154,22 +154,24 @@
border
>
<el-table-column prop="id" align="center" label="单号" />
<el-table-column prop="name" align="center" label="巡查名称" />
<el-table-column prop="type" align="center" label="巡查类型">
<el-table-column prop="name" align="center" label="防治项目名称" />
<el-table-column prop="dikeName" align="center" label="工程名称"/>
<el-table-column prop="dikeCode" align="center" label="工程代码"/>
<el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope">
<span>{{
getDictLabelName(scope.row.type, "maintenanceType")
}}</span>
</template>
</el-table-column>
<el-table-column prop="category" align="center" label="巡查类别">
<el-table-column prop="category" align="center" label="防治类别">
<template slot-scope="scope">
<span>{{
getDictLabelName(scope.row.category, "maintenanceCategory")
}}</span>
</template>
</el-table-column>
<el-table-column prop="status" align="center" label="巡查状态" width="100">
<el-table-column prop="status" align="center" label="处置状态" width="100">
<template slot-scope="scope">
<span style="position: relative"
:style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}">
@ -201,11 +203,11 @@
}}</span>
</template>
</el-table-column>
<el-table-column prop="dutyHolderName" align="center" label="责任人" />
<el-table-column prop="dutyHolderName" align="center" label="处置责任人" />
<el-table-column
prop="startDate"
align="center"
label="养护时间"
label="处置时间"
>
<template slot-scope="scope">
<span

Loading…
Cancel
Save