diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
index 4583f0cf..26d4b22f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
@@ -406,6 +406,9 @@ export default {
}
}
}
+::v-deep .el-popover {
+ z-index: 2 !important; /* 请根据你的项目需求设置合适的值 */
+}
.weather {
width: 435px;
span {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
index 5960c430..26ebccb4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
@@ -16,6 +16,19 @@ const station = {
},
},
key: "stakeMark[0]",
+ rules: [
+ {
+ message: "请补全桩号",
+ callback(value, data) {
+ if (value || data.stakeMark[1]){
+ return /^0\d{2}|\d{3}$/.test(value);
+ } else {
+ return true
+ }
+ },
+ }
+ ],
+
},
{
prefix: {
@@ -25,6 +38,18 @@ const station = {
},
},
key: "stakeMark[1]",
+ rules: [
+ {
+ message: "请补全桩号",
+ callback(value, data) {
+ if (value || data.stakeMark[0]){
+ return /^0\d{2}|\d{3}$/.test(value);
+ } else {
+ return true
+ }
+ },
+ }
+ ],
},
],
},
@@ -214,9 +239,33 @@ export const searchFormList = [
options: [
{
key: "endStakeMark[0]",
+ rules: [
+ {
+ message: "请补全桩号",
+ callback(value, data) {
+ if (value || data.endStakeMark[1]){
+ return /^0\d{2}|\d{3}$/.test(value);
+ } else {
+ return true
+ }
+ },
+ }
+ ],
},
{
key: "endStakeMark[1]",
+ rules: [
+ {
+ message: "请补全桩号",
+ callback(value, data) {
+ if (value || data.endStakeMark[0]){
+ return /^0\d{2}|\d{3}$/.test(value);
+ } else {
+ return true
+ }
+ },
+ }
+ ],
},
],
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
index 96b43006..4391926f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
@@ -135,7 +135,7 @@ export default {
},
onExport() {
let url ='/business/warning/export'
-
+
let loadingInstance = Loading.service({
fullscreen: true,
background: "#00000052",
@@ -230,13 +230,13 @@ export default {
warningSource: data?.warningSource || '',
direction: data.direction,
startTime: daterange && daterange.length > 0 ? daterange[0] : "",
- endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
- completeTime: this.activeName == "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
+ // endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
+ completeTime: daterange && daterange.length > 0 ? daterange[1] : "",
startStakeMark: stakeMark,
endStakeMark: endStakeMark,
};
console.log(this.searchData)
- // this.getData();
+ this.getData();
}
},
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
index 094b123b..4be74ea1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
@@ -456,6 +456,7 @@ export default {
align-items: center;
flex-direction: column;
--keep-ratio: scaleX(1);
+ pointer-events: auto;
.body-l {
width: 70%;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js
index cd2e240c..f7f7718d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js
@@ -36,7 +36,7 @@ const series = event_channel.map((name, sid) => {
} else {
return Math.round(params.value * 1000) / 10 + '%'
}
-
+
}
},
data: []
@@ -68,7 +68,11 @@ var options = {
containLabel: true,
},
yAxis: {
- type: 'value'
+ type: 'value',
+ axisLabel: {
+ fontSize: 10,
+ color: "#fff",
+ },
},
@@ -84,30 +88,30 @@ var options = {
fontSize: 10,
color: "#fff",
},
- formatter:function(value)
- {
- var ret = "";//拼接加\n返回的类目项
- var maxLength = 2;//每项显示文字个数
- var valLength = value.length;//X轴类目项的文字个数
- var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
- if (rowN > 1)//如果类目项的文字大于3,
- {
- for (var i = 0; i < rowN; i++) {
- var temp = "";//每次截取的字符串
- var start = i * maxLength;//开始截取的位置
- var end = start + maxLength;//结束截取的位置
- //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
- temp = value.substring(start, end) + "\n";
- ret += temp; //凭借最终的字符串
- }
- return ret;
- }
- else {
- return value;
- }
- }
+ formatter:function(value)
+ {
+ var ret = "";//拼接加\n返回的类目项
+ var maxLength = 2;//每项显示文字个数
+ var valLength = value.length;//X轴类目项的文字个数
+ var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
+ if (rowN > 1)//如果类目项的文字大于3,
+ {
+ for (var i = 0; i < rowN; i++) {
+ var temp = "";//每次截取的字符串
+ var start = i * maxLength;//开始截取的位置
+ var end = start + maxLength;//结束截取的位置
+ //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
+ temp = value.substring(start, end) + "\n";
+ ret += temp; //凭借最终的字符串
+ }
+ return ret;
+ }
+ else {
+ return value;
+ }
+ }
},
},
series
};
-export default options;
\ No newline at end of file
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
index 8fa4f6ef..aa9aef5c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
@@ -25,13 +25,15 @@
size="mini"
class="btnSearch"
icon="el-icon-search"
+ @click="bindEventTypePublishManageMonth"
>查询
重置重置
-
+
@@ -59,6 +61,9 @@ export default {
this.bindEventTypePublishManageMonth();
},
bindEventTypePublishManageMonth(){
+ if (!this.dateTime){
+ return this.$modal.msgWarning("请选择日期");
+ }
request({
url: `/business/manage/eventTypePublishManageMonth`,
method: "post",
@@ -88,11 +93,11 @@ export default {
// });
// var myChart = echarts.init(document.getElementById("postTrendsMonth"));
// myChart.setOption(chartsStatistics);
- })
+ })
},
},
mounted() {
-
+
this.init();
// setTimeout(() => {
// this.$nextTick(() => {
@@ -131,11 +136,11 @@ export default {
display: flex;
align-items: center;
height: 40px;
- width: 50%;
+ width: 35%;
font-size: 14px;
margin-bottom: 10px;
- left: 20px;
- top: 2px;
+ left: 10px;
+ top: 5px;
z-index: 9;
div {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/assets/charts.js
index 0f33f352..6ce1d42f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/assets/charts.js
@@ -92,7 +92,7 @@ var options = {
grid: {
top: "75px", //上边距
right: "0", //右边距
- left: "0", //左边距
+ left: "3px", //左边距
bottom: "20px", //下边距
containLabel: true,
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
index 090f6794..f6e044a3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
@@ -91,7 +91,7 @@ var options = {
grid: {
top: "80px", //上边距
right: "0", //右边距
- left: "0", //左边距
+ left: "3px", //左边距
bottom: "20px", //下边距
containLabel: true,
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
index bdef0ab3..1182b7df 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
@@ -65,7 +65,7 @@ export default {
});
var myChart = echarts.init(document.getElementById("postTrendsMonth"));
myChart.setOption(chartsStatistics);
- })
+ })
},
init(){
this.dateTime = new Date();
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
index 422b8f73..2fa210a0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
@@ -20,11 +20,12 @@
:formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
+
-
+
{{ enum_channels[scope.row.publishChannels-1] }}
@@ -115,7 +116,7 @@ export default {
},
onDelete(id){
const self = this;
- this.$confirm("是否删除?"+id, "警告", {
+ this.$confirm("是否删除?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@@ -153,7 +154,7 @@ export default {
responseType: 'blob',
}).then((res) => {
console.log(res)
-
+
const url = window.URL.createObjectURL(new Blob([res]));
let link = document.createElement("a");
link.style.display = "none";
@@ -174,7 +175,7 @@ export default {
},
handleSearch(data) {
let daterange = data.daterange;
-
+
let _searchData = {
pageSize: 20,
pageNum: 1
@@ -202,6 +203,7 @@ export default {
request({
url: `/business/manage/statisticsList?pageNum=${this.searchData.pageNum}&pageSize=${this.searchData.pageSize}`,
method: "post",
+ params: { pageNum: this.searchData.pageNum, pageSize: this.searchData.pageSize },
data: this.searchData,
}).then((result) => {
if (result.code != 200) return Message.error(result?.msg);
@@ -209,7 +211,7 @@ export default {
this.total = result.total;
});
},
-
+
onSizeChange(pageSize) {
this.tableData = [];
this.searchData.pageSize = pageSize;