mengff
/
jihe-hs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug更改

wangqin
zhangzhang 7 months ago
parent
520a632862
commit
a510f77d15
6 changed files with 94 additions and 41 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. 4
      ruoyi-ui/src/assets/styles/sidebar-dark.scss
  2. 18
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue
  3. 63
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
  4. 19
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue
  5. 22
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
  6. 9
      ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss

4
ruoyi-ui/src/assets/styles/sidebar-dark.scss
View File

@ -2829,6 +2829,7 @@
color: #999; color: #999;
border: solid 1px #666; border: solid 1px #666;
background: transparent; background: transparent;
} }
@ -2854,7 +2855,8 @@
.el-year-table td.disabled .cell { .el-year-table td.disabled .cell {
color: #999; color: #999;
border: solid 1px #666; border: solid 1px #666;
background: transparent; // background: transparent;
background: #1B586D;
} }

18
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue
View File

@ -51,6 +51,7 @@
class="selectRoad" class="selectRoad"
v-model="dateTime" v-model="dateTime"
style="width: 140px" style="width: 140px"
:picker-options="pickerOptions"
:type=" :type="
type == 1 ? 'date' : type == 2 ? 'month' : type == 4 ? 'year' : '' type == 1 ? 'date' : type == 2 ? 'month' : type == 4 ? 'year' : ''
" "
@ -148,6 +149,11 @@ export default {
}, },
], ],
dateTime: moment().format("YYYY-MM-DD HH:mm:ss"), 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() { async searchQuery() {
let startTime = ""; let startTime = "";
console.log("searchQuery", this.type); if (this.type == 2) {
if (this.type == 3) { startTime = moment(this.dateTime).format("YYYY-MM-01 00:00:00");
} else if (this.type == 3) {
let year = moment().year(); let year = moment().year();
// console.log(year, this.quarter);
if (this.quarter == 1) { if (this.quarter == 1) {
startTime = `${year}-01-01 00:00:00`; startTime = `${year}-01-01 00:00:00`;
} else if (this.quarter == 2) { } else if (this.quarter == 2) {
@ -230,6 +236,8 @@ export default {
} else { } else {
startTime = `${year}-10-01 00:00:00`; startTime = `${year}-10-01 00:00:00`;
} }
} else if (this.type == 4) {
startTime = moment(this.dateTime).format("YYYY-01-01 00:00:00");
} else { } else {
startTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss"); startTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss");
} }
@ -238,7 +246,6 @@ export default {
// type: this.type, // type: this.type,
// startTime: startTime, // startTime: startTime,
// } // }
console.log("++++++++++++", startTime);
var formData = new FormData(); var formData = new FormData();
formData.append("direction", this.direction); formData.append("direction", this.direction);
formData.append("type", this.type); formData.append("type", this.type);
@ -252,7 +259,8 @@ export default {
this.direction = "1"; this.direction = "1";
this.type = "1"; this.type = "1";
this.quarter = "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() { renderCharts() {
this.$nextTick(() => { this.$nextTick(() => {

63
ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
View File

@ -53,9 +53,10 @@
v-if="type != 'quarter'" v-if="type != 'quarter'"
class="selectRoad" class="selectRoad"
v-model="dateTime" v-model="dateTime"
:picker-options="pickerOptions"
style="width: 140px" style="width: 140px"
:type=" :type="
type == 'date' type == 'day'
? 'date' ? 'date'
: type == 'month' : type == 'month'
? 'month' ? 'month'
@ -106,10 +107,7 @@
text="暂无数据..." text="暂无数据..."
class="empty" class="empty"
></Empty> ></Empty>
<div <div ref="chart2" class="chart_div keep-ratio"></div>
ref="chart2"
class="chart_div keep-ratio"
></div>
</div> </div>
</div> </div>
@ -195,7 +193,7 @@ export default {
label: "月", label: "月",
}, },
{ {
value: "date", value: "day",
label: "日", label: "日",
}, },
{ {
@ -222,16 +220,22 @@ export default {
value: "4", value: "4",
}, },
], ],
dateTime: "2024", dateTime: moment().format("YYYY-MM-DD HH:mm:ss"),
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
direction: "1", direction: "1",
dataList: [], dataList: [],
selectIndex: 1, selectIndex: 1,
selectId: 1, selectId: 1,
reset: false, reset: false,
type: "year", type: "day",
chart1List: [], chart1List: [],
chart2List: [], chart2List: [],
chart3List: [], chart3List: [],
list: [ list: [
{ {
name: "大学城-长清", name: "大学城-长清",
@ -288,8 +292,8 @@ export default {
}, },
onReset() { onReset() {
this.direction = "1"; this.direction = "1";
this.type = "year"; this.type = "day";
this.dateTime = "2024"; this.dateTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss");
this.selectId = 1; this.selectId = 1;
this.selectIndex = 1; this.selectIndex = 1;
this.reset = true; this.reset = true;
@ -297,25 +301,30 @@ export default {
}, },
searchQuery() { searchQuery() {
let startTime = ""; let startTime = "";
let qType = this.type == "date" ? "day" : this.type; // let qType = this.type == "date" ? "day" : this.type;
if (this.type == "quarter") { if (this.type == "month") {
// let year = moment().year(); startTime = moment(this.dateTime).format("YYYY-MM-01 HH:mm:ss");
// if (this.quarter == 1) { } else if (this.type == "quarter") {
// startTime = `${year}-01-01 00:00:00` let year = moment().year();
// } else if (this.quarter == 2) { if (this.quarter == 1) {
// startTime = `${year}-04-01 00:00:00` startTime = `${year}-01-01 00:00:00`;
// } else if (this.quarter == 3) { } else if (this.quarter == 2) {
// startTime = `${year}-07-01 00:00:00` startTime = `${year}-04-01 00:00:00`;
// } else { } else if (this.quarter == 3) {
// startTime = `${year}-10-01 00:00:00` 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 { } else {
startTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss"); startTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss");
} }
console.log("startTime", startTime);
//感知事件趋势 //感知事件趋势
getWarningTrend({ getWarningTrend({
type: qType, type: this.type,
sectionId: this.selectId, sectionId: this.selectId,
createTime: startTime, createTime: startTime,
direction: this.direction, direction: this.direction,
@ -431,7 +440,7 @@ export default {
//感知事件类型分析 //感知事件类型分析
getWarningSectionType({ getWarningSectionType({
type: qType, type: this.type,
sectionId: this.selectId, sectionId: this.selectId,
createTime: startTime, createTime: startTime,
direction: this.direction, direction: this.direction,
@ -697,21 +706,21 @@ export default {
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
&.unit_con_01{ &.unit_con_01 {
margin: 100px 20px 0; margin: 100px 20px 0;
.chart_div { .chart_div {
width: 100%; width: 100%;
height: 240px; height: 240px;
} }
} }
&.unit_con_02{ &.unit_con_02 {
margin: 70px 20px 0; margin: 70px 20px 0;
.chart_div { .chart_div {
width: 100%; width: 100%;
height: 290px; height: 290px;
} }
} }
&.unit_con_03{ &.unit_con_03 {
margin: 70px 20px 0; margin: 70px 20px 0;
.chart_div { .chart_div {
width: 100%; width: 100%;

19
ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue
View File

@ -40,7 +40,10 @@
<div class="arrow"></div> <div class="arrow"></div>
</div> </div>
<div v-for="(item, index) in topo" v-if="index < 5" class="switch"> <div v-for="(item, index) in topo" v-if="index < 5" class="switch">
<div :class="'line ' + (item.netWorkStatus ? '' : 'liner')" style="height: 70px;margin-top: -10px;"></div> <div
:class="'line ' + (item.netWorkStatus ? '' : 'liner')"
style="height: 70px; margin-top: -10px"
></div>
<div <div
:class="'arrowdown ' + (item.netWorkStatus ? '' : 'arrowr')" :class="'arrowdown ' + (item.netWorkStatus ? '' : 'arrowr')"
></div> ></div>
@ -73,7 +76,10 @@
</div> </div>
<div class="c" style="margin-top: -5px"> <div class="c" style="margin-top: -5px">
<div v-for="(item, index) in topo" v-if="index >= 5" class="switch"> <div v-for="(item, index) in topo" v-if="index >= 5" class="switch">
<div :class="'line ' + (item.netWorkStatus ? '' : 'liner')" style="height: 70px;margin-top: -10px;"></div> <div
:class="'line ' + (item.netWorkStatus ? '' : 'liner')"
style="height: 70px; margin-top: -10px"
></div>
<div <div
:class="'arrowdown ' + (item.netWorkStatus ? '' : 'arrowr')" :class="'arrowdown ' + (item.netWorkStatus ? '' : 'arrowr')"
></div> ></div>
@ -163,7 +169,13 @@
v-for="(idv, idvx) in itm.dcDeviceList" v-for="(idv, idvx) in itm.dcDeviceList"
class="device-item" class="device-item"
> >
<img :src="require(`./t${itm.netWorkStatus}${idv.childType||'1-1'}.svg`)" /> <img
:src="
require(`./t${itm.netWorkStatus}${
idv.childType || '1-1'
}.svg`)
"
/>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
@ -305,6 +317,7 @@ export default {
text-align: center; text-align: center;
line-height: 50px; line-height: 50px;
margin-top: 20px; margin-top: 20px;
cursor: pointer;
} }
.listItemAction { .listItemAction {

22
ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
View File

@ -58,6 +58,7 @@
class="selectRoad" class="selectRoad"
v-model="dateTime" v-model="dateTime"
style="width: 140px" style="width: 140px"
:picker-options="pickerOptions"
:type=" :type="
type == 1 type == 1
? 'date' ? 'date'
@ -197,7 +198,6 @@ export default {
], ],
dateTime: moment().format("YYYY-MM-DD HH:mm:ss"), dateTime: moment().format("YYYY-MM-DD HH:mm:ss"),
dataList: [], dataList: [],
quarter: "",
year: "", year: "",
list: [ list: [
{ {
@ -243,6 +243,11 @@ export default {
follow: "161", follow: "161",
}, },
], ],
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
}; };
}, },
@ -252,13 +257,17 @@ export default {
this.selectIndex = index; this.selectIndex = index;
this.selectId = item.id; this.selectId = item.id;
this.reset = false; this.reset = false;
// this.searchQuery(); this.searchQuery();
}, },
searchQuery() {},
onReset() { onReset() {
this.selectId = 1; this.selectId = 1;
this.selectIndex = 1; this.selectIndex = 1;
this.reset = true; this.reset = true;
// this.searchQuery(); this.direction = "1";
this.type = "1";
this.dateTime = moment().format("YYYY-MM-DD HH:mm:ss");
this.searchQuery();
}, },
}, },
mounted() { mounted() {
@ -456,10 +465,10 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
height: 40px; height: 40px;
width: 100%; width: 500px;
font-size: 14px; font-size: 14px;
margin-bottom: 10px; margin-bottom: 10px;
z-index: 1000; z-index: 1;
div { div {
white-space: nowrap; white-space: nowrap;
@ -503,6 +512,9 @@ export default {
border-color: transparent; border-color: transparent;
color: white; color: white;
} }
.keep-ratio {
height: 200px;
}
} }
} }
} }

9
ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
View File

@ -602,3 +602,12 @@ div.el-popper.el-cascader__dropdown {
.el-cascader { .el-cascader {
width: 100%; width: 100%;
} }
.el-year-table td.disabled .cell{
color: #C0C4CC!important;
background: #1B586D;
}
.el-month-table td.disabled .cell{
color: #C0C4CC!important;
background: #1B586D;
}
Write Preview
Loading…
Cancel
Save