决策信息接口修改

src/api/DecisionInfo.ts

@@ -7,7 +7,8 @@ export interface createParams {
   alertType: string;
   timeType: string;
   locationType: string;
-  infoJson: string;
+  drivingInfo: string;
+  submissionInfo: string;
 }
 
 interface Item {
@@ -15,7 +16,8 @@ interface Item {
   alertType: string;
   timeType: string;
   locationType: string;
-  infoJson: string;
+  drivingInfo: string;
+  submissionInfo: string;
 }
 
 export class PagingQueryParams extends PageQueryDto {

src/pages/DecisionInfoManage.vue

@@ -83,8 +83,14 @@
             />
             <q-input
               outlined
-              label="提示信息"
+              label="行车方面"
-              v-model="creatForm.infoJson"
+              v-model="creatForm.drivingInfo"
+              lazy-rules
+            />
+            <q-input
+              outlined
+              label="信息报送方面"
+              v-model="creatForm.submissionInfo"
               lazy-rules
             />
           </q-card-section>
@@ -154,11 +160,21 @@ const columnDefs: QTableColumn[] = [
     align: 'center',
   },
   {
-    name: 'infoJson',
+    name: 'drivingInfo',
-    label: '提示信息',
+    label: '行车方面',
     field: (row) => {
-      if (row.infoJson) {
+      if (row.drivingInfo) {
-        return JSON.parse(row.infoJson);
+        return JSON.parse(row.drivingInfo);
+      }
+    },
+    align: 'center',
+  },
+  {
+    name: 'submissionInfo',
+    label: '信息报送方面',
+    field: (row) => {
+      if (row.submissionInfo) {
+        return JSON.parse(row.submissionInfo);
       }
     },
     align: 'center',
@@ -216,7 +232,8 @@ const creatForm = reactive({
   alertType: '',
   timeType: '',
   locationType: '',
-  infoJson: '',
+  drivingInfo: '',
+  submissionInfo: '',
 });
 
 function onReset() {
@@ -224,7 +241,8 @@ function onReset() {
   creatForm.alertType = '';
   creatForm.timeType = '';
   creatForm.locationType = '';
-  creatForm.infoJson = '';
+  creatForm.drivingInfo = '';
+  creatForm.submissionInfo = '';
   myForm.value?.resetValidation();
 }
 
@@ -238,10 +256,14 @@ function onCreate() {
           alertType: creatForm.alertType,
           timeType: creatForm.timeType,
           locationType: creatForm.locationType,
-          infoJson: creatForm.infoJson,
+          drivingInfo: creatForm.drivingInfo,
+          submissionInfo: creatForm.submissionInfo,
         };
-        if (creatForm.infoJson) {
+        if (creatForm.drivingInfo) {
-          params.infoJson = JSON.stringify(creatForm.infoJson);
+          params.drivingInfo = JSON.stringify(creatForm.drivingInfo);
+        }
+        if (creatForm.submissionInfo) {
+          params.submissionInfo = JSON.stringify(creatForm.submissionInfo);
         }
         if (creatForm.id) {
           await updataAlarmInfo(+creatForm.id, params);
@@ -269,7 +291,8 @@ function editData(row: any) {
   creatForm.alertType = row.alertType;
   creatForm.timeType = row.timeType || '';
   creatForm.locationType = row.locationType || '';
-  creatForm.infoJson = row.infoJson || '';
+  creatForm.drivingInfo = row.drivingInfo || '';
+  creatForm.submissionInfo = row.submissionInfo || '';
   createFormShow.value = true;
 }
 

src/protos/alertInfo.ts

@@ -4,7 +4,7 @@
  * source: alertInfo.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";
-export namespace state {
+export namespace alert {
     export class NccAlertInfoMessage extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {