From 3ecc0558b12e5bd639ef68ca870842692851210f Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue, 22 Oct 2024 16:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E5=BC=B9=E6=A1=86=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=A2=9E=E5=8A=A0=E7=A6=81=E7=94=A8=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=92=8C=E7=A6=81=E9=80=89=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/AlertMock.ts                     |  2 ++
 src/components/alarm/alarmInfoDialog.vue | 30 +++++++++++++++++++++---
 src/pages/AlarmInfoList.vue              | 14 ++++++++++-
 src/protos/alertInfo.ts                  | 23 ++++++++++++++++++
 src/stores/line-net-store.ts             |  1 +
 xian-ncc-da-message                      |  2 +-
 6 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/src/api/AlertMock.ts b/src/api/AlertMock.ts
index f5d004d..74257a0 100644
--- a/src/api/AlertMock.ts
+++ b/src/api/AlertMock.ts
@@ -63,6 +63,8 @@ export interface Item {
   drivingInfo: string;
   submissionInfo: string;
   alarmStatus: number;
+  lineId: number;
+  lineType: string;
 }
 
 /**
diff --git a/src/components/alarm/alarmInfoDialog.vue b/src/components/alarm/alarmInfoDialog.vue
index b40b7e9..378ba67 100644
--- a/src/components/alarm/alarmInfoDialog.vue
+++ b/src/components/alarm/alarmInfoDialog.vue
@@ -49,11 +49,22 @@
               />
               <q-card-actions align="left">
                 <div class="q-gutter-md">
-                  <q-btn color="primary" label="确认" type="submit" />
-                  <q-btn color="red" label="误报" @click="falseAlarm" />
+                  <q-btn
+                    color="primary"
+                    label="确认"
+                    :disable="operateDisabled"
+                    type="submit"
+                  />
+                  <q-btn
+                    color="red"
+                    label="误报"
+                    :disable="operateDisabled"
+                    @click="falseAlarm"
+                  />
                   <q-btn
                     color="primary"
                     label="人工接警"
+                    :disable="operateDisabled"
                     @click="manualAlarm"
                   />
                 </div>
@@ -88,7 +99,7 @@
 <script setup lang="ts">
 import DraggableDialog from '../common/DraggableDialog.vue';
 import { useLineNetStore, AlarmInfo } from 'src/stores/line-net-store';
-import { onMounted, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { QForm, useQuasar } from 'quasar';
 import { saveAlertTypeData, showAlertTypeData } from './alarmInfoEnum';
 import {
@@ -97,6 +108,8 @@ import {
   recordManualAlarmInfoById,
 } from 'src/api/AlertMock';
 import { queryAlarmInfoById } from 'src/api/DecisionInfo';
+import { useUserStore } from 'src/stores/user-store';
+import { getMonitorPath } from 'src/router/routes';
 
 const props = defineProps<{
   alarmMeaasge?: AlarmInfo;
@@ -124,6 +137,7 @@ const alarmInfo = ref({
   level: '',
   time: '',
   lineId: '',
+  lineType: '',
   alertObject: '',
   alertType: '',
   locator_device_id: '',
@@ -203,6 +217,7 @@ function updata() {
   ];
   alarmInfo.value.alertObject = messageUse.alert_object.replace(/\[|]/g, '');
   alarmInfo.value.lineId = messageUse.line_id;
+  alarmInfo.value.lineType = messageUse.line_type;
 }
 
 async function searchByTipType() {
@@ -237,6 +252,15 @@ async function searchById() {
     });
   }
 }
+
+const userStore = useUserStore();
+const operateDisabled = computed(() => {
+  const config = getMonitorPath(userStore.roles);
+  const disabled =
+    config.lineType == alarmInfo.value.lineType &&
+    config.lineIds.includes(+alarmInfo.value.lineId);
+  return !disabled;
+});
 </script>
 
 <style lang='scss' scoped>
diff --git a/src/pages/AlarmInfoList.vue b/src/pages/AlarmInfoList.vue
index d5add68..842e31c 100644
--- a/src/pages/AlarmInfoList.vue
+++ b/src/pages/AlarmInfoList.vue
@@ -274,6 +274,13 @@ const columnDefs: QTableColumn[] = [
     field: 'lineId',
     align: 'center',
   },
+  {
+    name: 'lineType',
+    label: '线路类型',
+    field: 'lineType',
+    required: true,
+    align: 'center',
+  },
   {
     name: 'alertObject',
     label: '设备',
@@ -392,8 +399,12 @@ watch(
 );
 
 function updateSelect() {
+  const config = getMonitorPath(userStore.roles);
   for (let i = 0; i < selected.value.length; i++) {
-    if (selected.value[i].alarmStatus !== -1) {
+    const canSelect =
+      config.lineType == selected.value[i].lineType &&
+      config.lineIds.includes(+selected.value[i].lineId);
+    if (selected.value[i].alarmStatus !== -1 || !canSelect) {
       selected.value.splice(i, 1);
       i--;
     }
@@ -538,6 +549,7 @@ function openAlarmDialog(row: any) {
   row.alert_time = row.alertTime;
   row.alert_type = row.alertType;
   row.line_id = row.lineId;
+  row.line_type = row.lineType;
   row.alert_object = row.alertObject;
   row.alert_tip_id = row.alertTipId;
   row.alert_location_id = row.alertLocationId;
diff --git a/src/protos/alertInfo.ts b/src/protos/alertInfo.ts
index 8dba592..6f4f975 100644
--- a/src/protos/alertInfo.ts
+++ b/src/protos/alertInfo.ts
@@ -87,6 +87,7 @@ export namespace alert {
                 locator_device_id?: string;
                 alert_location_id?: number;
                 mock?: boolean;
+                line_type?: string;
             }) {
                 super();
                 pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -121,6 +122,9 @@ export namespace alert {
                     if ("mock" in data && data.mock != undefined) {
                         this.mock = data.mock;
                     }
+                    if ("line_type" in data && data.line_type != undefined) {
+                        this.line_type = data.line_type;
+                    }
                 }
             }
             get id() {
@@ -183,6 +187,12 @@ export namespace alert {
             set mock(value: boolean) {
                 pb_1.Message.setField(this, 10, value);
             }
+            get line_type() {
+                return pb_1.Message.getFieldWithDefault(this, 11, "") as string;
+            }
+            set line_type(value: string) {
+                pb_1.Message.setField(this, 11, value);
+            }
             static fromObject(data: {
                 id?: string;
                 level?: string;
@@ -194,6 +204,7 @@ export namespace alert {
                 locator_device_id?: string;
                 alert_location_id?: number;
                 mock?: boolean;
+                line_type?: string;
             }): Message {
                 const message = new Message({});
                 if (data.id != null) {
@@ -226,6 +237,9 @@ export namespace alert {
                 if (data.mock != null) {
                     message.mock = data.mock;
                 }
+                if (data.line_type != null) {
+                    message.line_type = data.line_type;
+                }
                 return message;
             }
             toObject() {
@@ -240,6 +254,7 @@ export namespace alert {
                     locator_device_id?: string;
                     alert_location_id?: number;
                     mock?: boolean;
+                    line_type?: string;
                 } = {};
                 if (this.id != null) {
                     data.id = this.id;
@@ -271,6 +286,9 @@ export namespace alert {
                 if (this.mock != null) {
                     data.mock = this.mock;
                 }
+                if (this.line_type != null) {
+                    data.line_type = this.line_type;
+                }
                 return data;
             }
             serialize(): Uint8Array;
@@ -297,6 +315,8 @@ export namespace alert {
                     writer.writeInt64(9, this.alert_location_id);
                 if (this.mock != false)
                     writer.writeBool(10, this.mock);
+                if (this.line_type.length)
+                    writer.writeString(11, this.line_type);
                 if (!w)
                     return writer.getResultBuffer();
             }
@@ -336,6 +356,9 @@ export namespace alert {
                         case 10:
                             message.mock = reader.readBool();
                             break;
+                        case 11:
+                            message.line_type = reader.readString();
+                            break;
                         default: reader.skipField();
                     }
                 }
diff --git a/src/stores/line-net-store.ts b/src/stores/line-net-store.ts
index 821ea40..5987389 100644
--- a/src/stores/line-net-store.ts
+++ b/src/stores/line-net-store.ts
@@ -14,6 +14,7 @@ export interface AlarmInfo {
   alert_time: string;
   alert_tip_id: number;
   line_id: string;
+  line_type: string;
   alert_object: string;
   alert_type: number;
   locator_device_id: string;
diff --git a/xian-ncc-da-message b/xian-ncc-da-message
index c20feed..4f9012b 160000
--- a/xian-ncc-da-message
+++ b/xian-ncc-da-message
@@ -1 +1 @@
-Subproject commit c20feed4b6ae3bdd02cb21b4cc5af03c55be869b
+Subproject commit 4f9012b0795f62bf352b078ebbc1b1fffa86849d