From 2efe6b57a735c6972e974c135ad29d8ea4021355 Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Fri, 10 May 2024 17:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/commandDispatch/index.js | 21 +- .../DisposalProcess/DialogVisible/index.vue | 575 ++++++++++++++---- .../Cards/DisposalProcess/index.vue | 5 +- .../pages/control/event/dispatch/index.vue | 49 +- .../PublishingChannelManagement/data.js | 12 +- 5 files changed, 530 insertions(+), 132 deletions(-) diff --git a/ruoyi-ui/src/api/commandDispatch/index.js b/ruoyi-ui/src/api/commandDispatch/index.js index f240d74d..3f85b074 100644 --- a/ruoyi-ui/src/api/commandDispatch/index.js +++ b/ruoyi-ui/src/api/commandDispatch/index.js @@ -99,7 +99,7 @@ export function addEventImportantFile(data) { }); } -// 新增重要事件文件内容 +// 修改重要事件文件内容 export function editEventImportantFile(data) { return request({ url: "/business/eventImportantFile", @@ -120,7 +120,24 @@ export function downloadEventImportantFile(data) { // 无分页查询事件列表 export function deventImportantFileList(eventId, type) { return request({ - url: `/business/eventImportantFile/list/?eventId=${eventId}/&type=${type}`, + url: `/business/eventImportantFile/list/?eventId=${eventId}&type=${type}`, + method: "get", + }); +} + +// 生成重要事件文件内容 +export function getEventImportantFile(data) { + return request({ + url: `/business/eventImportantFile/generate`, + method: "post", + data, + }); +} + +// 生成重要事件文件内容 +export function importantFileStatus(eventId) { + return request({ + url: `/business/eventImportantFile/getImportantFileStatus/${eventId}`, method: "get", }); } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue index 6db2d81a..f6658ae0 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue @@ -12,11 +12,6 @@ labelWidth="120px" /> - 上报侧重要素
-
@@ -39,28 +33,262 @@
- + +
重要事件
+
+ 报送单位: + + + 报送时间: {{ formFileData.createTime }} + +
+
+
+ + +
+
+ : +
+ + +
+
+
+ 填报人: +
+
+ 联系电话: +
+
+ 签发人: +
+
+ +
+
+
+ + + + + +
+ + +
+ +
+ +
重要事件
+
+ 报送单位: + + + 报送时间: {{ formFileData.createTime }} + +
+
+
+ + +
+
+ : +
+ + +
+
+
+ 填报人: +
+
+ 联系电话: +
+
+ 签发人: +
+
+ +
+
+ + + +
+ + + + + +
+ + +
+
+
重要事件
报送单位: - + 报送时间: {{ createTime }} + >报送时间: {{ formFileData.createTime }}
- + +
- : + :
填报人: + >
联系电话: + >
签发人: + >
- - - +
- -
重要事件 @@ -163,7 +409,8 @@ min-height: 10.5pt; font-size: 10.5pt; " - >山东高速青岛发展有限公司运营管理事业部 + {{ formFileData.fromDept }}2024年05月09日15时40分{{ formFileData.createTime }}

关于G15沈海高速K502+222交通事故的初报{{ formFileData.title }}

智慧管理中心：

-

- - 2024年05月09日11时02分，G15沈海高速K502+222沈阳方向发生侧翻事故，行1车道、行2车道、应急车道正常通行，无压车。
 - 未到达现场的情况：路管、交警、消防、医疗等单位正在赶往现场，具体情况稍后报告。 -

-

-

-

-

+ + {{ formFileData.content }} + + +

- 填报人:智慧高速菜单 联系电话:18678866677 签发人：郭璐明 + 填报人:{{ formFileData.createName }} + 联系电话:{{ formFileData.phoneNumber }} + 签发人：{{ formFileData.issued }}

@@ -343,12 +576,18 @@ import { formList, reportList } from "./data"; import { tabConfigList } from "../../EventInformation/components/EditEventInformationDialog/data.js"; import Button from "@screen/components/Buttons/Button.vue"; import request from "@/utils/request"; +import Pagination from "@screen/components/Pagination.vue"; import { + getEventImportantFile, getEventImportant, editEventImportant, deventImportantFileList, + addEventImportantFile, + editEventImportantFile, + importantFileStatus, } from "@/api/commandDispatch"; +import { delay, exportFile, confirm } from "@screen/utils/common"; var moment = require("moment"); export default { name: "EventDetail", @@ -356,6 +595,7 @@ export default { Dialog, Form, Button, + Pagination, }, model: { prop: "visible", @@ -371,7 +611,8 @@ export default { }, data() { return { - // formList, + type: 0, + newType: 0, showDocx: false, fData: {}, formConfigList: [], @@ -389,14 +630,21 @@ export default { chemicalsStatus: "", fireStatus: "", }, - fromDept: "齐鲁高速股份有限公司", - createTime: "2024年04月24日17时22分", - title: "关于G20青银高速K305+208交通事故的续报1", - toDept: "智慧管理中心", - content: "路管等单位及清障救援车辆已到达现场。预计结束时间为12时44分。", - createName: "张三", - phoneNumber: "18678866677", - issued: "康传刚", + formFileData: { + fromDept: "齐鲁高速股份有限公司", + createTime: "2024年04月24日17时22分", + title: "关于G20青银高速K305+208交通事故的续报1", + toDept: "智慧管理中心", + content: "路管等单位及清障救援车辆已到达现场。预计结束时间为12时44分。", + createName: "张三", + phoneNumber: "18678866677", + issued: "康传刚", + status: 0, + id: null, + }, + pageSize: 1, + pageNum: 1, + renewedList: [], // submitting: false, }; }, @@ -421,12 +669,9 @@ export default { }); if (infoData.code != 200) return Message.error(infoData?.msg); - // this.resultEventData = { ...infoData.data }; - // console.log("事件详情666", this.resultEventData); let info = infoData.data; if (typeof info.stakeMark == "string") { let numbers = info.stakeMark.match(/\d+/g).map(Number); - // console.log('numbers', numbers); info.stakeMark = numbers; } this.fData = info; @@ -484,8 +729,7 @@ export default { ); }) .catch((err) => { - console.log("err", err); - Message.error("查询失败6", err); + Message.error("查询失败", err); }), ]); @@ -502,21 +746,20 @@ export default { }); }, getReportData() { - console.log("事件id", this.eventId); getEventImportant(this.eventId).then((res) => { - console.log("详情", res); this.reportData = { ...res.data }; }); }, handleClick(tab, event) { this.activeName = tab.name; if (this.activeName == "second") { - deventImportantFileList(this.eventId, 1).then((res) => { - console.log("res", res); - }); + this.getEventImportantFileList(1); + } else if (this.activeName == "third") { + this.getEventImportantFileList(2); + } else if (this.activeName == "fourth") { + this.getEventImportantFileList(3); } }, - getProcess() { let directionFlg = true; @@ -559,12 +802,10 @@ export default { }); }); }, + // 事件提交 onSubmit() { - this.$refs.FormConfigRef.validate().then((formData) => { - console.log("事件修改", formData); - }); + this.$refs.FormConfigRef.validate().then((formData) => {}); this.$refs.FormReportRef.validate().then((formData) => { - console.log("事件侧重要素修改", formData); formData.eventId = this.eventId; editEventImportant(formData).then((result) => { if (result.code != 200) return Message.error(result?.msg); @@ -573,28 +814,123 @@ export default { }); }); }, + // 获取事件状态 + getImportantFileStatus() { + importantFileStatus(this.eventId).then((res) => { + this.type = res.data; + console.log("事件状态", res.data); + }); + }, + + // 分页 + getEventImportantFileList(type) { + deventImportantFileList(this.eventId, type).then((res) => { + if (res.length > 0) { + this.formFileData = res[0]; + if (type == "2") { + this.renewedList = res; + } + } else { + this.handleInitData(type); + } + }); + }, + // 重新生成数据 + handleInitData(type) { + let data = new FormData(); + data.append("eventId", this.eventId); + data.append("type", type); + getEventImportantFile(data).then((res) => { + this.formFileData = res.data; + if (type == "2") { + this.newType = 1; + this.renewedList.push(res.data); + this.pageNum = this.renewedList.length; + console.log("this.renewedList", this.renewedList); + } + }); + }, + // 切换分页 + onCurrentChange(val) { + console.log(`当前页: ${val}`); + this.renewedList.forEach((item, index) => { + if (val == index + 1) { + this.formFileData = item; + } + }); + }, + onSizeChange(pageSize) { + console.log("pageSize", pageSize); + }, + // 预览 handlePreview() { this.showDocx = true; }, + // 下载 handleDownload() { - console.log("下载"); - // 获取HTML内容 - const fileContent = this.$refs.initFile.innerHTML; - // // 将HTML转换为DOCX - const doc = htmlDocx.asBlob(fileContent); - // // 下载生成的文档 - FileSaver.saveAs(doc, "初报.docx"); + exportFile({ + url: "/business/eventImportantFile/download", + filename: this.type == 0 ? "初报" : this.type == 1 ? "续报" : "终报", + data: this.formFileData, + ext: "docx", + }); + }, + // 保存 + onFileSubmit() { + let data = { + ...this.formFileData, + status: 0, + }; + if (this.formFileData && this.formFileData.id) { + editEventImportantFile(data).then((res) => {}); + } else { + addEventImportantFile(data).then((res) => {}); + } + + if (this.activeName == "second") { + this.getEventImportantFileList(1); + } else if (this.activeName == "third") { + this.getEventImportantFileList(2); + } else if (this.activeName == "fourth") { + this.getEventImportantFileList(3); + } + }, + + // 保存并上报 + onSubmitUpload() { + let data = { + ...this.formFileData, + status: 1, + }; + if (this.formFileData && this.formFileData.id) { + editEventImportantFile(data).then((res) => {}); + } else { + addEventImportantFile(data).then((res) => {}); + } + this.getImportantFileStatus(); + if (this.activeName == "second") { + this.getEventImportantFileList(1); + } else if (this.activeName == "third") { + this.getEventImportantFileList(2); + } else if (this.activeName == "fourth") { + this.getEventImportantFileList(3); + } }, }, mounted() { this.initData(); this.getReportData(); + this.getImportantFileStatus(); }, };