diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
index 569edef9..56f21616 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
@@ -204,8 +204,8 @@ export const eventLevel = {
key: "eventLevel",
required: true,
type: "select",
+ default: 5,
options: {
- defaultl: 5,
options: [
{
key: 1,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
index d256a0a6..e60d42f8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
@@ -175,14 +175,12 @@ export default {
};
},
getData() {
- console.log('activeName', this.activeName)
if (this.activeName === '-1') {
- console.log('activeName22', this.activeName)
request({
url: `/perceivedEvents/warning/perceivedEventsList`,
method: "post",
- params: this.searchData,
- data: {}
+ params: { pageNum: this.searchData.pageNum, pageSize: this.searchData.pageSize },
+ data: this.searchData
}).then((result) => {
if (result.code != 200) return Message.error(result?.msg);
result.rows.forEach(it => {
@@ -334,7 +332,10 @@ export default {
let dendStakeMark = data.endStakeMark;
let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : '';
- let endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0]}+${dendStakeMark[1]}` : '';
+ let endStakeMark = '';
+ if (dendStakeMark) {
+ endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0]}+${dendStakeMark[1]}` : '';
+ }
this.searchData = {
...this.searchData,
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 8a2a51cc..6e1b0a1b 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
@@ -13,7 +13,7 @@
+ :type="type == 'date' ? 'date' : type == 'month' ? 'month' : type == 'year' ? 'year' : ''" placeholder="请选择" :clearable="false"/>
查询
重置
@@ -149,7 +149,7 @@ export default {
let startTime = "";
let qType = this.type == 'date' ? 'day' : this.type;
if (this.type == "quarter") {
- console.log('dateTime',this.quarter)
+ console.log('dateTime', this.quarter)
// let year = moment().year();
// if (this.quarter == 1) {
// startTime = `${year}-01-01 00:00:00`
@@ -194,7 +194,7 @@ export default {
xData.push(it.time.split(" ")[1] + "小时");
}
if (this.type == "quarter") {
- xData.push(it.QUARTER);
+ xData.push(it.month + '月');
}
if (it.number == maxObject.number) {
numbers.push({
@@ -340,88 +340,57 @@ export default {
chart3.xAxis.data = [];
if (res.code == 200 && res.data.length > 0) {
let data = res.data;
- if (this.type != "quarter") {
- const maxObject = data.filter(it => it.sectionNumber > 0).reduce((prev, current) => (current.sectionNumber > prev.sectionNumber ? current : prev));
- let zhs = [];
- let values1 = [];
- let values2 = [];
-
- data.forEach((it) => {
- if (it.sectionNumber > 0) {
- values2.push(it.sectionNumber);
- zhs.push(it.stakeMarkId);
-
- if (maxObject && maxObject.sectionNumber == it.sectionNumber) {
- values1.push({
- value: it.sectionNumber,
- itemStyle: {
- color: {
- type: 'linear',
- x: 0,
- y: 0,
- x2: 0,
- y2: 1,
- colorStops: [{
- offset: 0, color: '#01D5BC' // 0% 处的颜色
- }, {
- offset: 1, color: '#003B4E' // 100% 处的颜色
- }],
- global: false // 缺省为 false
- },
- borderRadius: 6
- },
- })
- } else {
- values1.push({
- value: it.sectionNumber,
- itemStyle: {
- borderRadius: 6
- },
- })
- }
+ const maxObject = data.filter(it => it.sectionNumber > 0).reduce((prev, current) => (current.sectionNumber > prev.sectionNumber ? current : prev));
+ let zhs = [];
+ let values1 = [];
+ let values2 = [];
+
+ data.forEach((it) => {
+ if (it.sectionNumber > 0) {
+ values2.push(it.sectionNumber);
+ zhs.push(it.stakeMarkId);
+ if (maxObject && maxObject.sectionNumber == it.sectionNumber) {
+ values1.push({
+ value: it.sectionNumber,
+ itemStyle: {
+ color: {
+ type: 'linear',
+ x: 0,
+ y: 0,
+ x2: 0,
+ y2: 1,
+ colorStops: [{
+ offset: 0, color: '#01D5BC' // 0% 处的颜色
+ }, {
+ offset: 1, color: '#003B4E' // 100% 处的颜色
+ }],
+ global: false // 缺省为 false
+ },
+ borderRadius: 6
+ },
+ })
+ } else {
+ values1.push({
+ value: it.sectionNumber,
+ itemStyle: {
+ borderRadius: 6
+ },
+ })
}
- })
- chart3.xAxis.data = zhs;
- chart3.series[0].data = values1;
- chart3.series[1].data = values2;
- } else {
- let zhs = [];
- let values = [];
- data.forEach((dt, i) => {
- dt.forEach((it) => {
- if (it.number > 0) {
- if (it.QUARTER == "第一季度") {
- values[i] = it.number;
- zhs[i] = it.stakeMark;
- }
- if (it.QUARTER == "第二季度") {
- values[i] = it.number;
- zhs[i] = it.stakeMark;
- }
- if (it.QUARTER == "第三季度") {
- values[i] = it.number;
- zhs[i] = it.stakeMark;
- }
- if (it.QUARTER == "第四季度") {
- values[i] = it.number;
- zhs[i] = it.stakeMark;
- }
- }
+ }
+ })
- })
- })
- chart3.xAxis.data = zhs;
- chart3.series[0].data = values;
- chart3.series[1].data = values;
- }
+ chart3.xAxis.data = zhs;
+ chart3.series[0].data = values1;
+ chart3.series[1].data = values2;
}
this.myChart3.setOption(chart3);
})
- if (this.type == "day")
- this.type = "date";
+ // if (this.type == "day")
+ // this.type = "date";
},
},
mounted() {