diff --git a/src/views/index-components/daily-index.vue b/src/views/index-components/daily-index.vue index ec5fa68..463a9e6 100644 --- a/src/views/index-components/daily-index.vue +++ b/src/views/index-components/daily-index.vue @@ -58,6 +58,8 @@ export default { roadNum: 0, // 病害趋势echart数据 diseaseChart: [], + // 道路分布echart数据 + roadChart: [], }; }, created() { diff --git a/src/views/index-components/disease-index.vue b/src/views/index-components/disease-index.vue index d5d40fd..601e7c5 100644 --- a/src/views/index-components/disease-index.vue +++ b/src/views/index-components/disease-index.vue @@ -155,9 +155,7 @@ export default { if (code === 200) { this.total = data.total; this.newTotal = data.today; - let all = 0; this.distributionList = data.data.map((item) => { - all += item.value; return { value: item.value, name: item.label, diff --git a/src/views/index-components/road-index.vue b/src/views/index-components/road-index.vue index 01f9a03..3f7d665 100644 --- a/src/views/index-components/road-index.vue +++ b/src/views/index-components/road-index.vue @@ -46,7 +46,7 @@ import * as echarts from "echarts"; // 接口 import { getEquipment, getEquipmentLog } from "@/api/xj/index/index"; -import fssmScroll from "../../components/scroll/fssm-scroll.vue"; +import fssmScroll from "@/components/scroll/fssm-scroll.vue"; export default { components: { fssmScroll }, name: "RoadIndex", diff --git a/src/views/xj/document/maintenance-notice/index.vue b/src/views/xj/document/maintenance-notice/index.vue index cb04a36..240edea 100644 --- a/src/views/xj/document/maintenance-notice/index.vue +++ b/src/views/xj/document/maintenance-notice/index.vue @@ -53,20 +53,6 @@ clearable > - - - - - - + { - if (code === 200) { - this.defectStatus = data; - } - }); + changeTab() { + this.resetQuery(); }, /** @@ -495,7 +473,18 @@ export default { handleQuery() { this.$refs.noticeForm.validate((valid) => { if (valid) { - this.searchForm = JSON.parse(JSON.stringify(this.noticeForm)); + const data = { + ...this.noticeForm, + classType: this.paramsDefectType ? this.paramsDefectType[0] : "", + defectType: this.paramsDefectType + ? this.paramsDefectType.length > 1 + ? this.paramsDefectType[1] + : "" + : "", + startTime: this.dateTime ? this.dateTime[0] : "", + endTime: this.dateTime ? this.dateTime[1] : "", + }; + this.searchForm = JSON.parse(JSON.stringify(data)); this.pagination.page = 1; this.getList(); } @@ -508,11 +497,10 @@ export default { * @return {*} */ resetQuery() { + this.$refs.noticeForm.resetFields(); this.noticeForm = { // 道路名称 segmentName: "", - // 病害状态 - state: "", // 上下行 inspectDirection: "", // 公里桩 @@ -525,6 +513,8 @@ export default { minArea: undefined, maxArea: undefined, }; + this.paramsDefectType = []; + this.dateTime = []; this.searchForm = {}; this.pagination.page = 1; this.getList(); @@ -540,8 +530,6 @@ export default { ...this.searchForm, ...this.pagination, maintenanceStatus: this.activeName, - startTime: this.dateTime ? this.dateTime[0] : "", - endTime: this.dateTime ? this.dateTime[1] : "", }; getMaintenanceNoticeList(data) .then(({ code, rows, total }) => { diff --git a/src/views/xj/inspection-report/daily-monitoring/components/four-content.vue b/src/views/xj/inspection-report/daily-monitoring/components/four-content.vue new file mode 100644 index 0000000..049f9c6 --- /dev/null +++ b/src/views/xj/inspection-report/daily-monitoring/components/four-content.vue @@ -0,0 +1,293 @@ + + + + + + \ No newline at end of file diff --git a/src/views/xj/inspection-report/daily-monitoring/components/one-content.vue b/src/views/xj/inspection-report/daily-monitoring/components/one-content.vue new file mode 100644 index 0000000..795229e --- /dev/null +++ b/src/views/xj/inspection-report/daily-monitoring/components/one-content.vue @@ -0,0 +1,243 @@ + + + + + + \ No newline at end of file diff --git a/src/views/xj/inspection-report/daily-monitoring/components/three-content.vue b/src/views/xj/inspection-report/daily-monitoring/components/three-content.vue new file mode 100644 index 0000000..7fcb795 --- /dev/null +++ b/src/views/xj/inspection-report/daily-monitoring/components/three-content.vue @@ -0,0 +1,234 @@ + + + + + + \ No newline at end of file diff --git a/src/views/xj/inspection-report/daily-monitoring/components/twe-content.vue b/src/views/xj/inspection-report/daily-monitoring/components/twe-content.vue new file mode 100644 index 0000000..e01b00b --- /dev/null +++ b/src/views/xj/inspection-report/daily-monitoring/components/twe-content.vue @@ -0,0 +1,285 @@ + + + + + + diff --git a/src/views/xj/inspection-report/daily-monitoring/index.vue b/src/views/xj/inspection-report/daily-monitoring/index.vue index 3b9b229..8c871f3 100644 --- a/src/views/xj/inspection-report/daily-monitoring/index.vue +++ b/src/views/xj/inspection-report/daily-monitoring/index.vue @@ -7,18 +7,86 @@ * @Description: 巡检报告-日常监测报告 --> @@ -26,6 +94,22 @@ export default { .content { width: 100%; height: calc(100vh - 5.4rem); - padding: 1rem; + padding: 0.5rem; + display: flex; + flex-wrap: wrap; + justify-content: space-between; +} + +.export { + height: 5%; + width: 100%; + justify-content: flex-end; +} + +.div-content { + width: 49.5%; + height: 46%; + background: url("~@/assets/index/road-content.png") no-repeat; + background-size: 100% 100%; }