diff --git a/src/App.vue b/src/App.vue index 4b6c74fd..794245e2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -180,6 +180,7 @@ body { transition: opacity 0.3s, transform 0.3s, left 0.3s, right 0.3s, top 0.4s, bottom 0.3s; overflow: hidden; + z-index: 2004; .warnTitle { display: flex; justify-content: space-between; diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index c620efb7..410cd2fd 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -41,19 +41,13 @@ export default { path: "/home", name: "首页", }, + { + path: "/realtimeData", + name: "实时数据", + }, { path: "/dataReport", - name: "数据展示", - subs: [ - { - path: "/dataReport", - name: "数据报表", - }, - { - path: "/realtimeData", - name: "实时数据", - }, - ], + name: "数据报表", }, { diff --git a/src/utils/api/index.js b/src/utils/api/index.js index 93a54552..3422832b 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -783,6 +783,16 @@ export function updateStateApi(data) { }); } +// 一键处理 oneKeyUpdateState + +export function oneKeyUpdateStateApi(data) { + return request({ + url: "/warning/oneKeyUpdateState", + method: "post", + data, + }); +} + //I2配置 //字段映射列表 export function listFieldConfigApi(data) { diff --git a/src/views/homePage/warnMessage/components/warnDialog.vue b/src/views/homePage/warnMessage/components/warnDialog.vue index b7416eda..b3d5354d 100644 --- a/src/views/homePage/warnMessage/components/warnDialog.vue +++ b/src/views/homePage/warnMessage/components/warnDialog.vue @@ -37,6 +37,21 @@ > + + + + + + 查询 导出数据 + 一键处理 @@ -128,7 +150,11 @@ diff --git a/src/views/homePage/warnMessage/index.vue b/src/views/homePage/warnMessage/index.vue index ff33d34d..bf77777a 100644 --- a/src/views/homePage/warnMessage/index.vue +++ b/src/views/homePage/warnMessage/index.vue @@ -132,7 +132,6 @@ export default { methods: { lookMore() { - delete this.params.state; // 这将彻底删除 state 属性 this.params.startTime = this.starttime; this.params.endTime = this.endtime; this.params.pageSize = 20; @@ -236,7 +235,7 @@ export default { font-size: 12px; text-align: center; &:first-child { - width: 12%; + width: 13%; } &:nth-child(2) { width: 15%; @@ -281,7 +280,7 @@ export default { width: 100%; span { &:first-child { - width: 12%; + width: 13%; } &:nth-child(2) { width: 15%; diff --git a/src/views/realTimeData/index.vue b/src/views/realTimeData/index.vue index a3c6e94d..2d22e180 100644 --- a/src/views/realTimeData/index.vue +++ b/src/views/realTimeData/index.vue @@ -1,66 +1,104 @@