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 d45fdf83..eb8ad895 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 @@ -287,6 +287,7 @@ export default { } const self = this; setTimeout(() => { + console.log(self.detailData,'---------------') // 获取map接口 const { AMap, mapIns } = self.$refs.AMapContainerRef.getMapInstance(); const { longitude, dimension, eventName } = self.detailData; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue index 5ee0890a..95953434 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue @@ -1,29 +1,15 @@ - + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue index cdec627e..b0f2b73f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue @@ -80,8 +80,7 @@ export default { }) .then((result) => { if (result.code != 200) return; - result.data.longitude = "116.829275"; - result.data.dimension = "36.583156"; + this.provideData.detail = result.data; console.log("这里是事件详情", this.provideData.detail); if ( diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index 4d5485ae..e6deb401 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -202,7 +202,7 @@ export default { }, onDelete() { if (this.formData.id) { - this.$confirm("确定误报吗?", "提示", { + this.$confirm("确定误报吗1?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/data.js new file mode 100644 index 00000000..45e71a0a --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/data.js @@ -0,0 +1,74 @@ +// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js"; +import * as PresetFormItems from "@screen/common/PresetFormItems.js"; +// import { merge, cloneDeep } from "lodash"; + +export const searchFormList = [ + { + label: "发布渠道:", + key: "publishChannels", + type: "select", + options: { + clearable: true, + options: [ + { + key: "1", + label: "手机短信", + }, + { + key: "2", + label: "微信公众号", + }, + { + key: "3", + label: "微博", + }, + { + key: "4", + label: "情报板", + }, + { + key: "5", + label: "服务网站", + }, + { + key: "6", + label: "微信小程序", + }, + { + key: "7", + label: "语音广播", + }, + ], + }, + }, + { + label: "时间范围:", + key: "daterange", + required: false, + type: "datePicker", + options: { + type: "daterange", + format: "yyyy-MM-dd HH:mm:ss", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + }, + // PresetFormItems.directionCreater("RadioGroup"), + { + label: "发布状态:", + key: "publishStatus", + type: "RadioGroup", + default: null, + options: { + options: [ + { + key: '1', + label: "成功", + }, + { + key: '2', + label: "失败", + }, + ], + }, + }, +]; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/delete.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/delete.svg new file mode 100644 index 00000000..67e8b429 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/delete.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/export.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/export.svg new file mode 100644 index 00000000..79ebc42b --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/export.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/refresh.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/refresh.svg new file mode 100644 index 00000000..e31a5500 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/images/refresh.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 00000000..cfe0df0f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index.vue index 615798fd..301d5cbc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index.vue @@ -15,7 +15,9 @@ - + + + @@ -29,10 +31,12 @@ import AuditAnalytics from "./components/auditAnalytics"; import PostTrendsDay from "./components/postTrendsDay"; import PostTrendsMonth from "./components/postTrendsMonth"; import NucleusThrough from "./components/nucleusThrough"; +import Record from "./components/record"; export default { name: "publicService", components: { + Record, TopComponent, ChannelAnalytics, EventTypeAnalysis,