diff --git a/ruoyi-ui/src/api/commandDispatch/index.js b/ruoyi-ui/src/api/commandDispatch/index.js
index 730f528b..0bcaa0a8 100644
--- a/ruoyi-ui/src/api/commandDispatch/index.js
+++ b/ruoyi-ui/src/api/commandDispatch/index.js
@@ -73,11 +73,46 @@ export function postNoSkipClear(data) {
});
}
-// 新增事件侧重要素
-// export function postNoSkipClear(data) {
-// return request({
-// url: "/dc/system/event/skipClear",
-// method: "post",
-// data,
-// });
-// }
+// 修改事件侧重要素
+export function editEventImportant(data) {
+ return request({
+ url: "/business/eventImportant",
+ method: "put",
+ data,
+ });
+}
+
+// 根据事件id查询侧重要素信息
+export function getEventImportant(eventId) {
+ return request({
+ url: "/business/eventImportant/" + eventId,
+ method: "get",
+ });
+}
+
+// 新增重要事件文件内容
+export function addEventImportantFile(data) {
+ return request({
+ url: "/business/eventImportantFile",
+ method: "post",
+ data,
+ });
+}
+
+// 新增重要事件文件内容
+export function editEventImportantFile(data) {
+ return request({
+ url: "/business/eventImportantFile",
+ method: "put",
+ data,
+ });
+}
+
+// 下载重要事件
+export function downloadEventImportantFile(data) {
+ return request({
+ url: "/business/eventImportantFile/download",
+ method: "post",
+ data,
+ });
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialogVisible/index.vue
index 8ff73b7a..9efa2928 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialogVisible/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialogVisible/index.vue
@@ -25,8 +25,8 @@
{{ item.name }}
@@ -40,8 +40,8 @@
{{ item.vehiclePlate + item.vehicleText }}
@@ -128,27 +128,44 @@ export default {
handleSubmit() {
this.form.dispatchId = this.id;
console.log("data", this.data);
- let employeesData = this.form.employees;
console.log("this.form,this.form", this.form);
- // employeesData.forEach((item) => {
- // for (let i = 0; i < this.data.length; i++) {
- // if (this.data[i].employeesMap.length > 0) {
- // for (let j = 0; j < this.data[i].employeesMap.length; j++) {
- // if (this.data[i].employeesMap[j].id == item) {
- // this.form.employees(...)
-
- // item.id = item;
- // item.name = this.data[i].employeesMap[j].name;
- // }
- // }
- // }
- // }
- // });
- this.form.vehicle;
-
- // postUpdateSource(this.form).then((res) => {
- // this.$emit("handleRefresh");
- // });
+ let newEmployees = [];
+ let newVehiclesMap = [];
+ this.form.employees.forEach((item) => {
+ for (let i = 0; i < this.data.length; i++) {
+ if (this.data[i].employeesMap.length > 0) {
+ for (let j = 0; j < this.data[i].employeesMap.length; j++) {
+ if (this.data[i].employeesMap[j].id == item) {
+ newEmployees.push({
+ id: item,
+ name: this.data[i].employeesMap[j].name,
+ });
+ }
+ }
+ }
+ }
+ });
+ this.form.vehicle.forEach((item) => {
+ for (let i = 0; i < this.data.length; i++) {
+ if (this.data[i].vehiclesMap.length > 0) {
+ for (let j = 0; j < this.data[i].vehiclesMap.length; j++) {
+ if (this.data[i].vehiclesMap[j].id == item) {
+ newVehiclesMap.push({
+ id: item,
+ vehiclePlate: this.data[i].vehiclesMap[j].vehiclePlate,
+ });
+ }
+ }
+ }
+ }
+ });
+ this.form.employees = newEmployees;
+ this.form.vehicle = newVehiclesMap;
+ console.log("88888888", this.form);
+
+ postUpdateSource(this.form).then((res) => {
+ this.$emit("handleRefresh");
+ });
},
},
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
index 2d538317..e6b06573 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
@@ -130,13 +130,15 @@ export default {
this.employeesChoice = [];
this.vehiclesChoice = [];
this.staff.forEach((element) => {
- this.employeesChoice.push(element);
- // this.employeesChoice.push(element.resourceId);
+ // this.employeesChoice.push(element);
+ this.employeesChoice.push(element.resourceId);
});
this.vehicle.forEach((element) => {
- this.vehiclesChoice.push(element);
- // this.vehiclesChoice.push(element.resourceId);
+ // this.vehiclesChoice.push(element);
+ this.vehiclesChoice.push(element.resourceId);
});
+ // console.log("this.employeesChoice", this.employeesChoice);
+ // console.log("this.vehiclesChoice", this.vehiclesChoice);
});
},
getVehicleTypeList() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/data.js
index 5f23bdd1..a799defb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/data.js
@@ -311,96 +311,146 @@ export const formList = [
export const reportList = [
{
label: "车型及车牌号:",
- key: "eventCause",
+ key: "plateNumber",
type: "input",
options: {
- disabled: true,
placeholder: "",
},
},
{
label: "分流点名称及桩号:",
- key: "eventCause",
+ key: "diversionPoint",
type: "input",
options: {
- disabled: true,
placeholder: "",
},
},
{
label: "目前处置进度:",
- key: "eventCause",
+ key: "currentProgress",
type: "input",
options: {
- disabled: true,
placeholder: "",
},
},
{
label: "已采取的措施:",
- key: "eventCause",
+ key: "takeSteps",
type: "input",
options: {
- disabled: true,
placeholder: "",
},
},
{
label: "是否启动应急预案:",
- key: "eventCause",
- type: "radio",
- options: {
- disabled: true,
- placeholder: "",
+ key: "planStatus",
+ type: "RadioGroup",
+ default: 0,
+ options: {
+ options: [
+ {
+ label: "是",
+ key: 1,
+ },
+ {
+ label: "否",
+ key: 0,
+ },
+ ],
},
},
{
label: "交警是否到达:",
- key: "eventCause",
- type: "radio",
+ key: "trafficPoliceStatus",
+ type: "RadioGroup",
+ default: 0,
options: {
- disabled: true,
- placeholder: "",
+ options: [
+ {
+ label: "是",
+ key: 1,
+ },
+ {
+ label: "否",
+ key: 0,
+ },
+ ],
},
},
{
label: "医疗是否到达:",
- key: "eventCause",
- type: "input",
- options: {
- disabled: true,
- placeholder: "",
+ key: "medicalStatus",
+ type: "RadioGroup",
+ default: 0,
+ options: {
+ options: [
+ {
+ label: "是",
+ key: 1,
+ },
+ {
+ label: "否",
+ key: 0,
+ },
+ ],
},
},
{
label: "是否做好情报板提示工作:",
- key: "eventCause",
- type: "input",
+ key: "boardStatus",
+ type: "RadioGroup",
+ default: 0,
options: {
- disabled: true,
- placeholder: "",
+ options: [
+ {
+ label: "是",
+ key: 1,
+ },
+ {
+ label: "否",
+ key: 0,
+ },
+ ],
},
},
{
label: "是否有危化品泄露:",
- key: "eventCause",
- type: "input",
- options: {
- disabled: true,
- placeholder: "",
+ key: "chemicalsStatus",
+ type: "RadioGroup",
+ default: 0,
+ options: {
+ options: [
+ {
+ label: "是",
+ key: 1,
+ },
+ {
+ label: "否",
+ key: 0,
+ },
+ ],
},
},
{
label: "消防是否到达:",
- key: "eventCause",
- type: "input",
- options: {
- disabled: true,
- placeholder: "",
+ key: "fireStatus",
+ type: "RadioGroup",
+ default: 0,
+ options: {
+ options: [
+ {
+ label: "是",
+ key: 1,
+ },
+ {
+ label: "否",
+ key: 0,
+ },
+ ],
},
},
];
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 b3510579..2441c96e 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
@@ -19,12 +19,15 @@
/> -->
上报侧重要素
+
-
+
@@ -127,7 +131,7 @@ export default {
emit: ["fullHeight"],
data() {
return {
- dialogVisible: true,
+ dialogVisible: false,
eventId: "1a91d65cc31f4a9d90122888edb31043",
test: null,
testRadio: "input",