diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 8dd4fe1f..a905be35 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -72,7 +72,7 @@ h6 { } .el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; + margin-top: 27vh !important; margin-bottom: 1vh; } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue index c3be162b..d88ee74e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue @@ -1,36 +1,48 @@ - diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue index 27befccc..49aba55a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue @@ -1,5 +1,9 @@ - + - + - \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue index 9a49a1c4..62dbd396 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue @@ -1,475 +1,521 @@ + \ No newline at end of file + 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 ce2b75e2..48cff105 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 @@ -1,33 +1,83 @@ @@ -36,19 +86,19 @@ import Dialog from "@screen/components/Dialog/index"; import TimeLine1 from "@screen/components/TimeLine/TimeLine1/index"; import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index"; -import Form from '@screen/components/FormConfig'; -import { formList } from "./data" +import Form from "@screen/components/FormConfig"; +import { formList } from "./data"; // import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js" import Video from "@screen/components/Video"; -import Carousel from "./Carousel/index.vue" -import EventPlanDialog from "./eventPlanDialog/index.vue" -import Button from '@screen/components/Buttons/Button.vue'; +import Carousel from "./Carousel/index.vue"; +import EventPlanDialog from "./eventPlanDialog/index.vue"; +import Button from "@screen/components/Buttons/Button.vue"; import request from "@/utils/request"; import { Message } from "element-ui"; var moment = require("moment"); export default { - name: 'EventDetail', + name: "EventDetail", components: { Dialog, Form, @@ -57,40 +107,42 @@ export default { Video, Carousel, Button, - EventPlanDialog + EventPlanDialog, }, model: { - prop: 'visible', - event: 'update:value' + prop: "visible", + event: "update:value", }, props: { visible: Boolean, activeName: String, formData: { type: Object, - default: () => { } - } + default: () => {}, + }, }, data() { return { formList, isShowDialog: false, info: [], - timeLine1List: [{ - time: "", - label: "", - isActive: false, - }], + timeLine1List: [ + { + time: "", + label: "", + isActive: false, + }, + ], timeLine2List: [ { time: "", name: "", - desc: '', + desc: "", posts: "", direction: "left", - } + }, ], - } + }; }, computed: { modelVisible: { @@ -101,13 +153,13 @@ export default { return this.visible; }, set(val) { - this.$emit('update:value', val) - } - } + this.$emit("update:value", val); + }, + }, }, methods: { getProcess() { - if (this.activeName == '-1' || this.activeName == '0') { + if (this.activeName == "-1" || this.activeName == "0") { this.timeLine1List = []; this.timeLine2List = []; return; @@ -118,113 +170,104 @@ export default { request({ url: `/system/process/list`, method: "get", - params: { eventId: this.formData.id } - }).then(result => { + params: { eventId: this.formData.id }, + }).then((result) => { if (result.code != 200) return Message.error(result?.msg); const rows = result.rows; this.timeLine1List = []; this.timeLine2List = []; - this.formData?.processConfigList.forEach(it => { - const process = rows.find(row => it.nodeNode == row.processId); + this.formData?.processConfigList.forEach((it) => { + const process = rows.find((row) => it.nodeNode == row.processId); if (process) { - this.timeLine1List.push( - { - time: moment(process.operationTime || new Date()).format('HH:mm'), - label: it.processNode, - isActive: true, - } - ); + this.timeLine1List.push({ + time: moment(process.operationTime || new Date()).format("HH:mm"), + label: it.processNode, + isActive: true, + }); this.timeLine2List.push({ - time: moment(process.operationTime || new Date()).format('yyyy-MM-DD HH:mm:ss'), + time: moment(process.operationTime || new Date()).format( + "yyyy-MM-DD HH:mm:ss" + ), name: process.operator, desc: process.context, posts: "", - direction: directionFlg ? 'left' : 'right', - }) + direction: directionFlg ? "left" : "right", + }); directionFlg = !directionFlg; - } else { - this.timeLine1List.push( - { - time: "", - label: it.processNode, - isActive: false, - } - ) + this.timeLine1List.push({ + time: "", + label: it.processNode, + isActive: false, + }); } - }) - - - }) - + }); + }); }, onCloseAddNew() { this.isShowDialog = false; }, onDelete() { if (this.formData.id) { - this.$confirm('确定误报吗?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' + this.$confirm("确定误报吗?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", }).then(() => { // this.modelVisible = false; // this.$emit('queryData', true); // return; - if (this.activeName == '-1') { + if (this.activeName == "-1") { request({ url: `/business/warning/delete`, - method: 'post', - data: { id: this.formData.id } - }).then(result => { - if (result.code == 200) Message.success('成功!'); + method: "post", + data: { id: this.formData.id }, + }).then((result) => { + if (result.code == 200) Message.success("成功!"); else Message.error(result?.msg); this.modelVisible = false; - this.$emit('queryData', true); - }) + this.$emit("queryData", true); + }); } else { request({ url: `dc/system/event/${this.formData.eventType}/${this.formData.id}`, - method: 'delete', - }).then(result => { - if (result.code == 200) Message.success('成功!'); + method: "delete", + }).then((result) => { + if (result.code == 200) Message.success("成功!"); else Message.error(result?.msg); this.modelVisible = false; - this.$emit('queryData', true); - }) + this.$emit("queryData", true); + }); } - }) - + }); } - }, onSubmit() { - let url = '/business/plans/list/warning/type' - if (this.activeName == '-1') { - url = '/business/plans/list/warning/type' + let url = "/business/plans/list/warning/type"; + if (this.activeName == "-1") { + url = "/business/plans/list/warning/type"; } else { - url = '/business/plans/list/event/type' + url = "/business/plans/list/event/type"; } request({ url: url, method: "post", - data: this.formData - }).then(result => { + data: this.formData, + }).then((result) => { if (result.code != 200) return Message.error(result?.msg); this.info = result.data; this.isShowDialog = true; - }) - + }); }, reInitData() { - console.log('reInitData') - this.$emit('update:value', false) - this.$emit('queryData', true); - } - } -} + console.log("reInitData"); + this.$emit("update:value", false); + this.$emit("queryData", true); + }, + }, +}; \ No newline at end of file + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue index 7f75001e..887be3d7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue @@ -1,5 +1,5 @@ -