Browse Source

fix: 修复bug

sy-water-data-board-ui
panyuyi 1 month ago
parent
commit
106e961674
  1. 6
      src/layout/Iframe.vue
  2. 120
      src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
  3. 4
      src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue
  4. 4
      src/views/dike/runManage/patrolMaintenance/statisticsAnalysis/index.vue
  5. 169
      src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
  6. 127
      src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
  7. 92
      src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
  8. 173
      src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
  9. 4
      src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue
  10. 4
      src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue
  11. 4
      src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
  12. 7
      src/views/reservoir/safeOperation/components/DataStatistics.vue
  13. 4
      src/views/sluice/runManage/patrolMaintenance/overviewAnalysis/index.vue
  14. 4
      src/views/sluice/runManage/patrolMaintenance/statisticsAnalysis/index.vue
  15. 2
      src/views/sluice/safeOperation/components/BaseInfo.vue
  16. 4
      vue.config.js

6
src/layout/Iframe.vue

@ -10,6 +10,12 @@
frameborder="no" frameborder="no"
style="border: none" style="border: none"
></iframe> ></iframe>
<!-- <iframe
class="w-full h-full"
src="http://172.16.34.83:6050/sgcyy-slgcyxgl/sy-water-data-board-ui"
frameborder="no"
style="border: none"
></iframe> -->
</div> </div>
</div> </div>
</template> </template>

120
src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue

@ -150,10 +150,11 @@
</div> </div>
<el-table :height="tableHeight" :data="tableData" border> <el-table :height="tableHeight" :data="tableData" border>
<!--<el-table-column prop="id" align="center" label="单号"/>--> <!--<el-table-column prop="id" align="center" label="单号"/>-->
<el-table-column type="index" label="序号"/> <el-table-column type="index" align="center" label="序号" width="100">
</el-table-column>
<el-table-column prop="detail.name" align="center" label="巡查名称" /> <el-table-column prop="detail.name" align="center" label="巡查名称" />
<el-table-column prop="dikeName" align="center" label="堤防名称"/> <el-table-column prop="dikeName" align="center" label="堤防名称" />
<el-table-column prop="dikeCode" align="center" label="堤防代码"/> <el-table-column prop="dikeCode" align="center" label="堤防代码" />
<el-table-column align="center" label="巡查类型"> <el-table-column align="center" label="巡查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
@ -164,48 +165,99 @@
<el-table-column prop="category" align="center" label="巡查类别"> <el-table-column prop="category" align="center" label="巡查类别">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.detail.category || '', "maintenanceCategory") getDictLabelName(
scope.row.detail.category || "",
"maintenanceCategory"
)
}}</span> }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span style="position: relative" <span
:style="['3', '5', '6'].includes(scope.row.detail.status) && {color: 'rgba(0,0,0,0.4)'}"> style="position: relative"
<div :style="
v-if="scope.row.detail.status === '1'" ['3', '5', '6'].includes(scope.row.detail.status) && {
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D" color: 'rgba(0,0,0,0.4)',
></div> }
<div "
v-if="scope.row.detail.status === '2'" >
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885" <div
></div> v-if="scope.row.detail.status === '1'"
<div style="
v-if="scope.row.detail.status === '4'" position: absolute;
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE" left: -16px;
></div> top: 6px;
<div width: 8px;
v-if="['3', '5', '6'].includes(scope.row.detail.status)" height: 8px;
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6" border-radius: 50%;
></div> background: #ffb20d;
{{ getDictLabelName(scope.row.detail.status, "maintenanceStatus") }} "
</span> ></div>
<div
v-if="scope.row.detail.status === '2'"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #0ec885;
"
></div>
<div
v-if="scope.row.detail.status === '4'"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #3a89fe;
"
></div>
<div
v-if="['3', '5', '6'].includes(scope.row.detail.status)"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #a6a6a6;
"
></div>
{{
getDictLabelName(scope.row.detail.status, "maintenanceStatus")
}}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="问题等级" width="120"> <el-table-column align="center" label="问题等级" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.detail.problemLevel || '', "maintenanceLevel") getDictLabelName(
scope.row.detail.problemLevel || "",
"maintenanceLevel"
)
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="detail.dutyHolderName" align="center" label="责任人" />
<el-table-column <el-table-column
prop="submitTime" prop="detail.dutyHolderName"
align="center" align="center"
label="验收时间" label="责任人"
/> />
<el-table-column prop="submitTime" align="center" label="验收时间" />
<el-table-column <el-table-column
prop="opera" prop="opera"
@ -309,7 +361,13 @@ export default {
handleCheckDetails(row, mode) { handleCheckDetails(row, mode) {
this.$router.push({ this.$router.push({
path: "acceptanceDetails", path: "acceptanceDetails",
query: { id: row.id, formId: row.formId, recordId: row.detail.recordId, defectId: row.detail.problemId, mode: mode }, query: {
id: row.id,
formId: row.formId,
recordId: row.detail.recordId,
defectId: row.detail.problemId,
mode: mode,
},
}); });
}, },
getDictLabelName(type, dictListName) { getDictLabelName(type, dictListName) {
@ -353,7 +411,7 @@ export default {
this.paramsData.time && this.paramsData.time.length > 1 this.paramsData.time && this.paramsData.time.length > 1
? this.paramsData.time[1] ? this.paramsData.time[1]
: "", : "",
} },
}; };
postV2ApprovalList({ postV2ApprovalList({
data: { data: {

4
src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue

@ -128,10 +128,10 @@ export default {
return getV2PatrolStatisticChart({ return getV2PatrolStatisticChart({
group, group,
startTime: this.paramsData.timeRange[0] startTime: this.paramsData.timeRange[0]
? this.paramsData[0] + " 00:00:00" ? this.paramsData.timeRange[0] + " 00:00:00"
: null, : null,
endTime: this.paramsData.timeRange[1] endTime: this.paramsData.timeRange[1]
? this.paramsData[1] + " 23:59:59" ? this.paramsData.timeRange[1] + " 23:59:59"
: null, : null,
adcd: this.paramsData.adcd, adcd: this.paramsData.adcd,
}); });

4
src/views/dike/runManage/patrolMaintenance/statisticsAnalysis/index.vue

@ -201,10 +201,10 @@ export default {
return getV2PatrolStatisticChart({ return getV2PatrolStatisticChart({
group, group,
startTime: this.paramsData.timeRange[0] startTime: this.paramsData.timeRange[0]
? this.paramsData[0] + " 00:00:00" ? this.paramsData.timeRange[0] + " 00:00:00"
: null, : null,
endTime: this.paramsData.timeRange[1] endTime: this.paramsData.timeRange[1]
? this.paramsData[1] + " 23:59:59" ? this.paramsData.timeRange[1] + " 23:59:59"
: null, : null,
code: this.paramsData.dikeCode, code: this.paramsData.dikeCode,
}); });

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

@ -115,69 +115,112 @@
class="flex-shrink-0 myml-12" class="flex-shrink-0 myml-12"
type="success" type="success"
@click="handleChangeQuery" @click="handleChangeQuery"
>查询 >查询
</el-button </el-button>
>
<el-button <el-button
class="flex-shrink-0" class="flex-shrink-0"
size="small" size="small"
@click="handleResetQuery" @click="handleResetQuery"
>重置 >重置
</el-button </el-button>
>
</div> </div>
</div> </div>
<div class="line" ref="lineRef"></div> <div class="line" ref="lineRef"></div>
</div> </div>
<el-table <el-table :height="tableHeight" :data="tableData" border>
:height="tableHeight" <!-- <el-table-column prop="id" align="center" label="单号"/> -->
:data="tableData" <el-table-column type="index" align="center" label="序号" width="100">
border </el-table-column>
> <el-table-column
<el-table-column prop="id" align="center" label="单号"/> prop="checkingName"
<el-table-column prop="checkingName" align="center" label="防治项目名称"/> align="center"
<el-table-column prop="dikeName" align="center" label="堤防名称"/> label="防治项目名称"
<el-table-column prop="dikeCode" 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="检查类型"> <el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.type, "maintenanceType") getDictLabelName(scope.row.type, "maintenanceType")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="category" align="center" label="防治类别"> <el-table-column prop="category" align="center" label="防治类别">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.category, "maintenanceCategory") getDictLabelName(scope.row.category, "maintenanceCategory")
}}</span> }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span style="position: relative" <span
:style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}"> style="position: relative"
<div :style="
v-if="scope.row.status === '1'" ['3', '5', '6'].includes(scope.row.status) && {
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D" color: 'rgba(0,0,0,0.4)',
></div> }
<div "
v-if="scope.row.status === '2'" >
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885" <div
></div> v-if="scope.row.status === '1'"
<div style="
v-if="scope.row.status === '4'" position: absolute;
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE" left: -16px;
></div> top: 6px;
<div width: 8px;
v-if="['3', '5', '6'].includes(scope.row.status)" height: 8px;
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6" border-radius: 50%;
></div> background: #ffb20d;
{{ getDictLabelName(scope.row.status, "maintenanceStatus") }} "
</span> ></div>
<div
v-if="scope.row.status === '2'"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #0ec885;
"
></div>
<div
v-if="scope.row.status === '4'"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #3a89fe;
"
></div>
<div
v-if="['3', '5', '6'].includes(scope.row.status)"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #a6a6a6;
"
></div>
{{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createName" align="center" label="检查责任人"/> <el-table-column prop="createName" align="center" label="检查责任人" />
<el-table-column <el-table-column
prop="startDate" prop="startDate"
align="center" align="center"
@ -185,7 +228,7 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
>{{ scope.row.startDate || "-" }}/{{ >{{ scope.row.startDate || "-" }}/{{
scope.row.endDate || "-" scope.row.endDate || "-"
}}</span }}</span
> >
@ -205,18 +248,16 @@
size="small" size="small"
v-hasPermi="['df:run:pestanimal2:inspection:list:item:check']" v-hasPermi="['df:run:pestanimal2:inspection:list:item:check']"
@click="handleCheckDetails(scope.row, false)" @click="handleCheckDetails(scope.row, false)"
>查看 >查看
</el-button </el-button>
>
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="scope.row.status !== '1'" :disabled="scope.row.status !== '1'"
v-hasPermi="['df:run:pestanimal2:inspection:list:item:edit']" v-hasPermi="['df:run:pestanimal2:inspection:list:item:edit']"
@click="handleEditDetails(scope.row, true)" @click="handleEditDetails(scope.row, true)"
>编辑 >编辑
</el-button </el-button>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -237,14 +278,12 @@
</template> </template>
<script> <script>
import TopBackTitle from "@/components/TopBackTitle/index.vue"; import TopBackTitle from "@/components/TopBackTitle/index.vue";
import {calcTableHeight} from "@/mixins/calcTableHeight"; import { calcTableHeight } from "@/mixins/calcTableHeight";
import { import { postV2RecordList } from "@/api/dike/pestAnimalControl2";
postV2RecordList
} from "@/api/dike/pestAnimalControl2";
export default { export default {
components: {TopBackTitle}, components: { TopBackTitle },
mixins: [calcTableHeight], mixins: [calcTableHeight],
data() { data() {
return { return {
@ -256,9 +295,9 @@ export default {
name: "", name: "",
type: "", type: "",
time: [], time: [],
dutyHolder: '', dutyHolder: "",
category: '', category: "",
status: '' status: "",
}, },
pageData: { pageData: {
pageNum: 1, // pageNum: 1, //
@ -280,7 +319,7 @@ export default {
}); });
}, },
mounted() { mounted() {
this.getTableData() this.getTableData();
}, },
methods: { methods: {
handleCurrentPageChange(page) { handleCurrentPageChange(page) {
@ -294,13 +333,13 @@ export default {
handleCheckDetails(row) { handleCheckDetails(row) {
this.$router.push({ this.$router.push({
path: "inspectionRecordDetails", path: "inspectionRecordDetails",
query: {id: row.id, checkingId: row.checkingId, mode: "check"}, query: { id: row.id, checkingId: row.checkingId, mode: "check" },
}); });
}, },
handleEditDetails(row) { handleEditDetails(row) {
this.$router.push({ this.$router.push({
path: "inspectionRecordDetails", path: "inspectionRecordDetails",
query: {id: row.id, checkingId: row.checkingId, mode: "edit"}, query: { id: row.id, checkingId: row.checkingId, mode: "edit" },
}); });
}, },
getDictLabelName(type, dictListName) { getDictLabelName(type, dictListName) {
@ -333,9 +372,15 @@ export default {
dutyHolder: this.paramsData.dutyHolder, dutyHolder: this.paramsData.dutyHolder,
category: this.paramsData.category, category: this.paramsData.category,
status: this.paramsData.status, status: this.paramsData.status,
startDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[0] : '', startDate:
endDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[1] : '', this.paramsData.time && this.paramsData.time.length > 1
} ? this.paramsData.time[0]
: "",
endDate:
this.paramsData.time && this.paramsData.time.length > 1
? this.paramsData.time[1]
: "",
};
postV2RecordList({ postV2RecordList({
data: { data: {
timeView: { timeView: {

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

@ -149,10 +149,16 @@
<div class="line" ref="lineRef"></div> <div class="line" ref="lineRef"></div>
</div> </div>
<el-table :height="tableHeight" :data="tableData" border> <el-table :height="tableHeight" :data="tableData" border>
<el-table-column prop="id" align="center" label="单号" /> <!-- <el-table-column prop="id" align="center" label="单号" /> -->
<el-table-column prop="detail.name" align="center" label="防治项目名称" /> <el-table-column type="index" align="center" label="序号" width="100">
<el-table-column prop="dikeName" align="center" label="堤防名称"/> </el-table-column>
<el-table-column prop="dikeCode" 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="检查类型"> <el-table-column align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
@ -163,48 +169,99 @@
<el-table-column prop="category" align="center" label="防治类别"> <el-table-column prop="category" align="center" label="防治类别">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.detail.category || '', "maintenanceCategory") getDictLabelName(
scope.row.detail.category || "",
"maintenanceCategory"
)
}}</span> }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span style="position: relative" <span
:style="['3', '5', '6'].includes(scope.row.detail.status) && {color: 'rgba(0,0,0,0.4)'}"> style="position: relative"
<div :style="
v-if="scope.row.detail.status === '1'" ['3', '5', '6'].includes(scope.row.detail.status) && {
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D" color: 'rgba(0,0,0,0.4)',
></div> }
<div "
v-if="scope.row.detail.status === '2'" >
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885" <div
></div> v-if="scope.row.detail.status === '1'"
<div style="
v-if="scope.row.detail.status === '4'" position: absolute;
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE" left: -16px;
></div> top: 6px;
<div width: 8px;
v-if="['3', '5', '6'].includes(scope.row.detail.status)" height: 8px;
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6" border-radius: 50%;
></div> background: #ffb20d;
{{ getDictLabelName(scope.row.detail.status, "maintenanceStatus") }} "
</span> ></div>
<div
v-if="scope.row.detail.status === '2'"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #0ec885;
"
></div>
<div
v-if="scope.row.detail.status === '4'"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #3a89fe;
"
></div>
<div
v-if="['3', '5', '6'].includes(scope.row.detail.status)"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #a6a6a6;
"
></div>
{{
getDictLabelName(scope.row.detail.status, "maintenanceStatus")
}}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="问题等级" width="120"> <el-table-column align="center" label="问题等级" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.detail.problemLevel || '', "maintenanceLevel") getDictLabelName(
scope.row.detail.problemLevel || "",
"maintenanceLevel"
)
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="detail.dutyHolderName" align="center" label="验收责任人" />
<el-table-column <el-table-column
prop="submitTime" prop="detail.dutyHolderName"
align="center" align="center"
label="验收时间" label="验收责任人"
/> />
<el-table-column prop="submitTime" align="center" label="验收时间" />
<el-table-column <el-table-column
prop="opera" prop="opera"
@ -308,7 +365,13 @@ export default {
handleCheckDetails(row, mode) { handleCheckDetails(row, mode) {
this.$router.push({ this.$router.push({
path: "acceptanceDetails", path: "acceptanceDetails",
query: { id: row.id, formId: row.formId, recordId: row.detail.recordId, defectId: row.detail.problemId, mode: mode }, query: {
id: row.id,
formId: row.formId,
recordId: row.detail.recordId,
defectId: row.detail.problemId,
mode: mode,
},
}); });
}, },
getDictLabelName(type, dictListName) { getDictLabelName(type, dictListName) {
@ -352,7 +415,7 @@ export default {
this.paramsData.time && this.paramsData.time.length > 1 this.paramsData.time && this.paramsData.time.length > 1
? this.paramsData.time[1] ? this.paramsData.time[1]
: "", : "",
} },
}; };
postV2ApprovalList({ postV2ApprovalList({
data: { data: {

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

@ -136,49 +136,60 @@
class="flex-shrink-0 myml-12" class="flex-shrink-0 myml-12"
type="success" type="success"
@click="handleChangeQuery" @click="handleChangeQuery"
>查询</el-button >查询</el-button
> >
<el-button <el-button
class="flex-shrink-0" class="flex-shrink-0"
size="small" size="small"
@click="handleResetQuery" @click="handleResetQuery"
>重置</el-button >重置</el-button
> >
</div> </div>
</div> </div>
<div class="line" ref="lineRef"></div> <div class="line" ref="lineRef"></div>
</div> </div>
<el-table <el-table :height="tableHeight" :data="tableData" border>
:height="tableHeight" <!-- <el-table-column prop="id" align="center" label="单号" /> -->
:data="tableData" <el-table-column type="index" align="center" label="序号" width="100">
border </el-table-column>
> <el-table-column
<el-table-column prop="id" align="center" label="单号" /> prop="checkingName"
<el-table-column prop="checkingName" align="center" label="防治项目名称" /> align="center"
<el-table-column prop="dikeName" align="center" label="堤防名称"/> label="防治项目名称"
<el-table-column prop="dikeCode" 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="检查类型"> <el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.type, "maintenanceType") getDictLabelName(scope.row.type, "maintenanceType")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="category" align="center" label="防治类别"> <el-table-column prop="category" align="center" label="防治类别">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.category, "maintenanceCategory") getDictLabelName(scope.row.category, "maintenanceCategory")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="level" align="center" label="问题等级" width="120"> <el-table-column
prop="level"
align="center"
label="问题等级"
width="120"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.problemLevel, "maintenanceLevel") getDictLabelName(scope.row.problemLevel, "maintenanceLevel")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dutyHolderName" align="center" label="处置责任人" /> <el-table-column
prop="dutyHolderName"
align="center"
label="处置责任人"
/>
<el-table-column <el-table-column
prop="startDate" prop="startDate"
align="center" align="center"
@ -186,7 +197,7 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
>{{ scope.row.startDate || "-" }}/{{ >{{ scope.row.startDate || "-" }}/{{
scope.row.endDate || "-" scope.row.endDate || "-"
}}</span }}</span
> >
@ -207,14 +218,14 @@
:disabled="scope.row.neckFlag === '0'" :disabled="scope.row.neckFlag === '0'"
v-hasPermi="['df:run:pestanimal2:defect:list:item:getInvoices']" v-hasPermi="['df:run:pestanimal2:defect:list:item:getInvoices']"
@click="handleReceiveDetails(scope.row)" @click="handleReceiveDetails(scope.row)"
>领单</el-button >领单</el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small"
v-hasPermi="['df:run:pestanimal2:defect:list:item:check']" v-hasPermi="['df:run:pestanimal2:defect:list:item:check']"
@click="handleCheckDetails(scope.row)" @click="handleCheckDetails(scope.row)"
>查看</el-button >查看</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -238,11 +249,9 @@
import TopBackTitle from "@/components/TopBackTitle/index.vue"; import TopBackTitle from "@/components/TopBackTitle/index.vue";
import { calcTableHeight } from "@/mixins/calcTableHeight"; import { calcTableHeight } from "@/mixins/calcTableHeight";
import { import { postV2ProblemList } from "@/api/dike/pestAnimalControl2";
postV2ProblemList
} from "@/api/dike/pestAnimalControl2";
export default { export default {
components: {TopBackTitle}, components: { TopBackTitle },
mixins: [calcTableHeight], mixins: [calcTableHeight],
data() { data() {
return { return {
@ -255,10 +264,10 @@ export default {
name: "", name: "",
type: "", type: "",
time: [], time: [],
dutyHolder: '', dutyHolder: "",
category: '', category: "",
status: '', status: "",
problemLevel: '' problemLevel: "",
}, },
pageData: { pageData: {
pageNum: 1, // pageNum: 1, //
@ -283,7 +292,7 @@ export default {
}); });
}, },
mounted() { mounted() {
this.getTableData() this.getTableData();
}, },
methods: { methods: {
handleCurrentPageChange(page) { handleCurrentPageChange(page) {
@ -297,13 +306,17 @@ export default {
handleReceiveDetails(row) { handleReceiveDetails(row) {
this.$router.push({ this.$router.push({
path: "maintenanceDetails", path: "maintenanceDetails",
query: { recordId: row.recordId, defectId: row.id, checkingId: row.checkingId }, query: {
recordId: row.recordId,
defectId: row.id,
checkingId: row.checkingId,
},
}); });
}, },
handleCheckDetails(row) { handleCheckDetails(row) {
this.$router.push({ this.$router.push({
path: "defectDetails", path: "defectDetails",
query: { recordId: row.recordId, defectId: row.id , mode: 'check' }, query: { recordId: row.recordId, defectId: row.id, mode: "check" },
}); });
}, },
getDictLabelName(type, dictListName) { getDictLabelName(type, dictListName) {
@ -338,9 +351,15 @@ export default {
category: this.paramsData.category, category: this.paramsData.category,
status: this.paramsData.status, status: this.paramsData.status,
problemLevel: this.paramsData.problemLevel, problemLevel: this.paramsData.problemLevel,
startDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[0] : '', startDate:
endDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[1] : '', this.paramsData.time && this.paramsData.time.length > 1
} ? this.paramsData.time[0]
: "",
endDate:
this.paramsData.time && this.paramsData.time.length > 1
? this.paramsData.time[1]
: "",
};
postV2ProblemList({ postV2ProblemList({
data: { data: {
timeView: { timeView: {
@ -376,4 +395,3 @@ export default {
} }
} }
</style> </style>

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

@ -136,82 +136,128 @@
class="flex-shrink-0 myml-12" class="flex-shrink-0 myml-12"
type="success" type="success"
@click="handleChangeQuery" @click="handleChangeQuery"
>查询</el-button >查询</el-button
> >
<el-button <el-button
class="flex-shrink-0" class="flex-shrink-0"
size="small" size="small"
@click="handleResetQuery" @click="handleResetQuery"
>重置</el-button >重置</el-button
> >
</div> </div>
</div> </div>
<div class="line" ref="lineRef"></div> <div class="line" ref="lineRef"></div>
</div> </div>
<el-table <el-table :height="tableHeight" :data="tableData" border>
:height="tableHeight" <!-- <el-table-column prop="id" align="center" label="单号" /> -->
:data="tableData" <el-table-column type="index" align="center" label="序号" width="100">
border </el-table-column>
>
<el-table-column prop="id" align="center" label="单号" />
<el-table-column prop="name" align="center" label="防治项目名称" /> <el-table-column prop="name" align="center" label="防治项目名称" />
<el-table-column prop="dikeName" align="center" label="堤防名称"/> <el-table-column prop="dikeName" align="center" label="堤防名称" />
<el-table-column prop="dikeCode" align="center" label="堤防代码"/> <el-table-column prop="dikeCode" align="center" label="堤防代码" />
<el-table-column prop="type" align="center" label="检查类型"> <el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.type, "maintenanceType") getDictLabelName(scope.row.type, "maintenanceType")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="category" align="center" label="防治类别"> <el-table-column prop="category" align="center" label="防治类别">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.category, "maintenanceCategory") getDictLabelName(scope.row.category, "maintenanceCategory")
}}</span> }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span style="position: relative" <span
:style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}"> style="position: relative"
<div :style="
v-if="scope.row.status === '1'" ['3', '5', '6'].includes(scope.row.status) && {
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D" color: 'rgba(0,0,0,0.4)',
></div> }
<div "
v-if="scope.row.status === '2'" >
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885" <div
></div> v-if="scope.row.status === '1'"
<div style="
v-if="scope.row.status === '4'" position: absolute;
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE" left: -16px;
></div> top: 6px;
<div width: 8px;
v-if="['3', '5', '6'].includes(scope.row.status)" height: 8px;
style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6" border-radius: 50%;
></div> background: #ffb20d;
{{ getDictLabelName(scope.row.status, "maintenanceStatus") }} "
</span> ></div>
<div
v-if="scope.row.status === '2'"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #0ec885;
"
></div>
<div
v-if="scope.row.status === '4'"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #3a89fe;
"
></div>
<div
v-if="['3', '5', '6'].includes(scope.row.status)"
style="
position: absolute;
left: -16px;
top: 6px;
width: 8px;
height: 8px;
border-radius: 50%;
background: #a6a6a6;
"
></div>
{{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="level" align="center" label="问题等级" width="120"> <el-table-column
prop="level"
align="center"
label="问题等级"
width="120"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.problemLevel, "maintenanceLevel") getDictLabelName(scope.row.problemLevel, "maintenanceLevel")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dutyHolderName" align="center" label="处置责任人" />
<el-table-column <el-table-column
prop="startDate" prop="dutyHolderName"
align="center" align="center"
label="处置时间" label="处置责任人"
> />
<el-table-column prop="startDate" align="center" label="处置时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
>{{ scope.row.startDate || "-" }}/{{ >{{ scope.row.startDate || "-" }}/{{
scope.row.endDate || "-" scope.row.endDate || "-"
}}</span }}</span
> >
@ -231,7 +277,7 @@
size="small" size="small"
v-hasPermi="['df:run:pestanimal2:maintenance:list:item:check']" v-hasPermi="['df:run:pestanimal2:maintenance:list:item:check']"
@click="handleCheckDetails(scope.row, 'check')" @click="handleCheckDetails(scope.row, 'check')"
>查看</el-button >查看</el-button
> >
<el-button <el-button
type="text" type="text"
@ -239,7 +285,7 @@
v-hasPermi="['df:run:pestanimal2:maintenance:list:item:edit']" v-hasPermi="['df:run:pestanimal2:maintenance:list:item:edit']"
:disabled="scope.row.status !== '4'" :disabled="scope.row.status !== '4'"
@click="handleCheckDetails(scope.row, 'edit')" @click="handleCheckDetails(scope.row, 'edit')"
>编辑</el-button >编辑</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -262,11 +308,9 @@
<script> <script>
import TopBackTitle from "@/components/TopBackTitle/index.vue"; import TopBackTitle from "@/components/TopBackTitle/index.vue";
import { calcTableHeight } from "@/mixins/calcTableHeight"; import { calcTableHeight } from "@/mixins/calcTableHeight";
import { import { postV2YhList } from "@/api/dike/pestAnimalControl2";
postV2YhList
} from "@/api/dike/pestAnimalControl2";
export default { export default {
components: {TopBackTitle}, components: { TopBackTitle },
mixins: [calcTableHeight], mixins: [calcTableHeight],
data() { data() {
return { return {
@ -279,10 +323,10 @@ export default {
name: "", name: "",
type: "", type: "",
time: [], time: [],
dutyHolder: '', dutyHolder: "",
category: '', category: "",
status: '', status: "",
problemLevel: '' problemLevel: "",
}, },
pageData: { pageData: {
pageNum: 1, // pageNum: 1, //
@ -307,7 +351,7 @@ export default {
}); });
}, },
mounted() { mounted() {
this.getTableData() this.getTableData();
}, },
methods: { methods: {
handleCurrentPageChange(page) { handleCurrentPageChange(page) {
@ -321,7 +365,13 @@ export default {
handleCheckDetails(row, mode) { handleCheckDetails(row, mode) {
this.$router.push({ this.$router.push({
path: "maintenanceDetails", path: "maintenanceDetails",
query: { id: row.id, recordId: row.recordId, defectId: row.problemId, status: row.status, mode: mode }, query: {
id: row.id,
recordId: row.recordId,
defectId: row.problemId,
status: row.status,
mode: mode,
},
}); });
}, },
getDictLabelName(type, dictListName) { getDictLabelName(type, dictListName) {
@ -356,9 +406,15 @@ export default {
category: this.paramsData.category, category: this.paramsData.category,
status: this.paramsData.status, status: this.paramsData.status,
problemLevel: this.paramsData.problemLevel, problemLevel: this.paramsData.problemLevel,
startDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[0] : '', startDate:
endDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[1] : '', this.paramsData.time && this.paramsData.time.length > 1
} ? this.paramsData.time[0]
: "",
endDate:
this.paramsData.time && this.paramsData.time.length > 1
? this.paramsData.time[1]
: "",
};
postV2YhList({ postV2YhList({
data: { data: {
timeView: { timeView: {
@ -394,4 +450,3 @@ export default {
} }
} }
</style> </style>

4
src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue

@ -128,10 +128,10 @@ export default {
return getV2PatrolStatisticChart({ return getV2PatrolStatisticChart({
group, group,
startTime: this.paramsData.timeRange[0] startTime: this.paramsData.timeRange[0]
? this.paramsData[0] + " 00:00:00" ? this.paramsData.timeRange[0] + " 00:00:00"
: null, : null,
endTime: this.paramsData.timeRange[1] endTime: this.paramsData.timeRange[1]
? this.paramsData[1] + " 23:59:59" ? this.paramsData.timeRange[1] + " 23:59:59"
: null, : null,
adcd: this.paramsData.adcd, adcd: this.paramsData.adcd,
}); });

4
src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue

@ -182,9 +182,9 @@ export default {
</div> </div>
</div> </div>
<el-table :height="tableHeight" :data="tableData" border> <el-table :height="tableHeight" :data="tableData" border>
<!-- <el-table-column type="index" 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="id" align="center" label="号" width="100"> <el-table-column type="index" align="center" label="号" width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"

4
src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue

@ -201,10 +201,10 @@ export default {
return getV2PatrolStatisticChart({ return getV2PatrolStatisticChart({
group, group,
startTime: this.paramsData.timeRange[0] startTime: this.paramsData.timeRange[0]
? this.paramsData[0] + " 00:00:00" ? this.paramsData.timeRange[0] + " 00:00:00"
: null, : null,
endTime: this.paramsData.timeRange[1] endTime: this.paramsData.timeRange[1]
? this.paramsData[1] + " 23:59:59" ? this.paramsData.timeRange[1] + " 23:59:59"
: null, : null,
code: this.paramsData.dikeCode, code: this.paramsData.dikeCode,
}); });

7
src/views/reservoir/safeOperation/components/DataStatistics.vue

@ -306,13 +306,8 @@ export default {
} }
.echarts-box { .echarts-box {
display: flex;
flex-wrap: wrap;
.echarts-dom-box { .echarts-dom-box {
margin-bottom: 24px; margin-bottom: 24px;
&:nth-child(2n) {
margin-left: 24px;
}
.title { .title {
padding-left: 10px; padding-left: 10px;
font-size: 14px; font-size: 14px;
@ -332,7 +327,7 @@ export default {
} }
} }
.echarts-dom { .echarts-dom {
width: 478px; width: 100%;
height: 260px; height: 260px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
} }

4
src/views/sluice/runManage/patrolMaintenance/overviewAnalysis/index.vue

@ -128,10 +128,10 @@ export default {
return getV2PatrolStatisticChart({ return getV2PatrolStatisticChart({
group, group,
startTime: this.paramsData.timeRange[0] startTime: this.paramsData.timeRange[0]
? this.paramsData[0] + " 00:00:00" ? this.paramsData.timeRange[0] + " 00:00:00"
: null, : null,
endTime: this.paramsData.timeRange[1] endTime: this.paramsData.timeRange[1]
? this.paramsData[1] + " 23:59:59" ? this.paramsData.timeRange[1] + " 23:59:59"
: null, : null,
adcd: this.paramsData.adcd, adcd: this.paramsData.adcd,
}); });

4
src/views/sluice/runManage/patrolMaintenance/statisticsAnalysis/index.vue

@ -211,10 +211,10 @@ export default {
return getV2PatrolStatisticChart({ return getV2PatrolStatisticChart({
group, group,
startTime: this.paramsData.timeRange[0] startTime: this.paramsData.timeRange[0]
? this.paramsData[0] + " 00:00:00" ? this.paramsData.timeRange[0] + " 00:00:00"
: null, : null,
endTime: this.paramsData.timeRange[1] endTime: this.paramsData.timeRange[1]
? this.paramsData[1] + " 23:59:59" ? this.paramsData.timeRange[1] + " 23:59:59"
: null, : null,
code: this.paramsData.wagaCode, code: this.paramsData.wagaCode,
}); });

2
src/views/sluice/safeOperation/components/BaseInfo.vue

@ -276,7 +276,7 @@ export default {
this.commonInitDict(); this.commonInitDict();
}, },
methods: { methods: {
commonInitDice() { commonInitDict() {
this.getDicts("engineering_scale").then((response) => { this.getDicts("engineering_scale").then((response) => {
this.projectScaleOptions = response.data; this.projectScaleOptions = response.data;
}); });

4
vue.config.js

@ -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,

Loading…
Cancel
Save