diff --git a/ruoyi-ui/src/assets/styles/sidebar-dark.scss b/ruoyi-ui/src/assets/styles/sidebar-dark.scss index d3cf0322..bef43f87 100644 --- a/ruoyi-ui/src/assets/styles/sidebar-dark.scss +++ b/ruoyi-ui/src/assets/styles/sidebar-dark.scss @@ -2829,6 +2829,7 @@ color: #999; border: solid 1px #666; background: transparent; + } @@ -2854,7 +2855,8 @@ .el-year-table td.disabled .cell { color: #999; border: solid 1px #666; - background: transparent; + // background: transparent; + background: #1B586D; } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue index a2cbbfcb..01eef9d7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue @@ -51,6 +51,7 @@ class="selectRoad" v-model="dateTime" style="width: 140px" + :picker-options="pickerOptions" :type=" type == 1 ? 'date' : type == 2 ? 'month' : type == 4 ? 'year' : '' " @@ -148,6 +149,11 @@ export default { }, ], dateTime: moment().format("YYYY-MM-DD HH:mm:ss"), + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, }; }, @@ -217,10 +223,10 @@ export default { }, async searchQuery() { let startTime = ""; - console.log("searchQuery", this.type); - if (this.type == 3) { + if (this.type == 2) { + startTime = moment(this.dateTime).format("YYYY-MM-01 00:00:00"); + } else if (this.type == 3) { let year = moment().year(); - // console.log(year, this.quarter); if (this.quarter == 1) { startTime = `${year}-01-01 00:00:00`; } else if (this.quarter == 2) { @@ -230,6 +236,8 @@ export default { } else { startTime = `${year}-10-01 00:00:00`; } + } else if (this.type == 4) { + startTime = moment(this.dateTime).format("YYYY-01-01 00:00:00"); } else { startTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss"); } @@ -238,7 +246,6 @@ export default { // type: this.type, // startTime: startTime, // } - console.log("++++++++++++", startTime); var formData = new FormData(); formData.append("direction", this.direction); formData.append("type", this.type); @@ -252,7 +259,8 @@ export default { this.direction = "1"; this.type = "1"; this.quarter = "1"; - this.dateTime = "2024-01-01 00:00:00"; + this.dateTime = moment().format("YYYY-MM-DD HH:mm:ss"); + this.searchQuery(); }, renderCharts() { this.$nextTick(() => { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index 680259b4..d316dcfc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -53,9 +53,10 @@ v-if="type != 'quarter'" class="selectRoad" v-model="dateTime" + :picker-options="pickerOptions" style="width: 140px" :type=" - type == 'date' + type == 'day' ? 'date' : type == 'month' ? 'month' @@ -106,10 +107,7 @@ text="暂无数据..." class="empty" > -
+
@@ -195,7 +193,7 @@ export default { label: "月", }, { - value: "date", + value: "day", label: "日", }, { @@ -222,16 +220,22 @@ export default { value: "4", }, ], - dateTime: "2024", + dateTime: moment().format("YYYY-MM-DD HH:mm:ss"), + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, direction: "1", dataList: [], selectIndex: 1, selectId: 1, reset: false, - type: "year", + type: "day", chart1List: [], chart2List: [], chart3List: [], + list: [ { name: "大学城-长清", @@ -288,8 +292,8 @@ export default { }, onReset() { this.direction = "1"; - this.type = "year"; - this.dateTime = "2024"; + this.type = "day"; + this.dateTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss"); this.selectId = 1; this.selectIndex = 1; this.reset = true; @@ -297,25 +301,30 @@ export default { }, searchQuery() { let startTime = ""; - let qType = this.type == "date" ? "day" : this.type; - if (this.type == "quarter") { - // let year = moment().year(); - // if (this.quarter == 1) { - // startTime = `${year}-01-01 00:00:00` - // } else if (this.quarter == 2) { - // startTime = `${year}-04-01 00:00:00` - // } else if (this.quarter == 3) { - // startTime = `${year}-07-01 00:00:00` - // } else { - // startTime = `${year}-10-01 00:00:00` - // } + // let qType = this.type == "date" ? "day" : this.type; + if (this.type == "month") { + startTime = moment(this.dateTime).format("YYYY-MM-01 HH:mm:ss"); + } else if (this.type == "quarter") { + let year = moment().year(); + if (this.quarter == 1) { + startTime = `${year}-01-01 00:00:00`; + } else if (this.quarter == 2) { + startTime = `${year}-04-01 00:00:00`; + } else if (this.quarter == 3) { + startTime = `${year}-07-01 00:00:00`; + } else { + startTime = `${year}-10-01 00:00:00`; + } + } else if (this.type == "year") { + startTime = moment(this.dateTime).format("YYYY-01-01 HH:mm:ss"); } else { startTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss"); } + console.log("startTime", startTime); //感知事件趋势 getWarningTrend({ - type: qType, + type: this.type, sectionId: this.selectId, createTime: startTime, direction: this.direction, @@ -431,7 +440,7 @@ export default { //感知事件类型分析 getWarningSectionType({ - type: qType, + type: this.type, sectionId: this.selectId, createTime: startTime, direction: this.direction, @@ -697,21 +706,21 @@ export default { position: relative; display: flex; align-items: center; - &.unit_con_01{ + &.unit_con_01 { margin: 100px 20px 0; .chart_div { width: 100%; height: 240px; } } - &.unit_con_02{ + &.unit_con_02 { margin: 70px 20px 0; .chart_div { width: 100%; height: 290px; } } - &.unit_con_03{ + &.unit_con_03 { margin: 70px 20px 0; .chart_div { width: 100%; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue index e14eee93..cc3443f6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue @@ -40,7 +40,10 @@
-
+
@@ -73,7 +76,10 @@
-
+
@@ -163,7 +169,13 @@ v-for="(idv, idvx) in itm.dcDeviceList" class="device-item" > - + Date.now(); + }, + }, }; }, @@ -252,13 +257,17 @@ export default { this.selectIndex = index; this.selectId = item.id; this.reset = false; - // this.searchQuery(); + this.searchQuery(); }, + searchQuery() {}, onReset() { this.selectId = 1; this.selectIndex = 1; this.reset = true; - // this.searchQuery(); + this.direction = "1"; + this.type = "1"; + this.dateTime = moment().format("YYYY-MM-DD HH:mm:ss"); + this.searchQuery(); }, }, mounted() { @@ -456,10 +465,10 @@ export default { display: flex; align-items: center; height: 40px; - width: 100%; + width: 500px; font-size: 14px; margin-bottom: 10px; - z-index: 1000; + z-index: 1; div { white-space: nowrap; @@ -503,6 +512,9 @@ export default { border-color: transparent; color: white; } + .keep-ratio { + height: 200px; + } } } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss index ac815e94..3b8e02ed 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss +++ b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss @@ -602,3 +602,12 @@ div.el-popper.el-cascader__dropdown { .el-cascader { width: 100%; } + +.el-year-table td.disabled .cell{ + color: #C0C4CC!important; + background: #1B586D; +} +.el-month-table td.disabled .cell{ + color: #C0C4CC!important; + background: #1B586D; +} \ No newline at end of file