From 584e17205f4cabd39bbc1b5d2489a59b48aa739e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 05 九月 2023 16:29:41 +0800
Subject: [PATCH] 报警号管理界面,功能

---
 src/views/mdc/base/AlarmManager.vue |  124 +++++++++++++++++++++++-----------------
 1 files changed, 71 insertions(+), 53 deletions(-)

diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index 2da413e..b8378ab 100644
--- a/src/views/mdc/base/AlarmManager.vue
+++ b/src/views/mdc/base/AlarmManager.vue
@@ -7,33 +7,46 @@
         @keyup.enter.native="searchQuery"
       >
         <a-row :gutter="24">
+          <!--<a-col-->
+            <!--:xl="4"-->
+            <!--:lg="4"-->
+            <!--:md="4"-->
+            <!--:sm="24"-->
+          <!--&gt;-->
+            <!--<a-form-item label="璁惧缂栧彿">-->
+              <!--<a-input-->
+                <!--placeholder="璇疯緭鍏ヨ澶囩紪鍙�"-->
+                <!--v-model="queryParam.equipmentId"-->
+              <!--&gt;</a-input>-->
+            <!--</a-form-item>-->
+          <!--</a-col>-->
+          <!--<a-col-->
+            <!--:xl="4"-->
+            <!--:lg="4"-->
+            <!--:md="4"-->
+            <!--:sm="24"-->
+          <!--&gt;-->
+            <!--<a-form-item label="璁惧鍚嶇О">-->
+              <!--<a-input-->
+                <!--placeholder="璇疯緭鍏ヨ澶囧悕绉�"-->
+                <!--v-model="queryParam.equipmentName"-->
+              <!--&gt;</a-input>-->
+            <!--</a-form-item>-->
+          <!--</a-col>-->
           <a-col
-            :xl="4"
-            :lg="4"
-            :md="4"
+            :xl="6"
+            :lg="7"
+            :md="8"
             :sm="24"
           >
-            <a-form-item label="璁惧缂栧彿">
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
-                v-model="queryParam.equipmentId"
-              ></a-input>
+            <a-form-item label="鎺у埗绯荤粺绫诲瀷">
+              <j-dict-select-tag
+                placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
+                v-model="queryParam.driveType"
+                dictCode="mdc_driveType"
+              />
             </a-form-item>
           </a-col>
-          <a-col
-            :xl="4"
-            :lg="4"
-            :md="4"
-            :sm="24"
-          >
-            <a-form-item label="璁惧鍚嶇О">
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉�"
-                v-model="queryParam.equipmentName"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-
             <a-col
               :xl="4"
               :lg="4"
@@ -53,10 +66,10 @@
               :md="4"
               :sm="24"
             >
-              <a-form-item label="鎶ヨ鎻忚堪">
+              <a-form-item label="鎶ヨ鍐呭">
                 <a-input
-                  placeholder="璇疯緭鍏ユ姤璀︽弿杩�"
-                  v-model="queryParam.alarmDescription"
+                  placeholder="璇疯緭鍏ユ姤璀﹀唴瀹�"
+                  v-model="queryParam.alarmContent"
                 ></a-input>
               </a-form-item>
             </a-col>
@@ -102,12 +115,12 @@
         @click="handleAddTRype"
         type="primary"
         icon="plus"
-      >椹卞姩鏂板</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-      >璁惧鏂板</a-button>
+      >鏂板</a-button>
+      <!--<a-button-->
+        <!--@click="handleAdd"-->
+        <!--type="primary"-->
+        <!--icon="plus"-->
+      <!--&gt;璁惧鏂板</a-button>-->
       <!--<a-upload-->
         <!--name="file"-->
         <!--:showUploadList="false"-->
@@ -223,18 +236,18 @@
               return parseInt(index) + 1;
             }
           },
-          {
-            title: '璁惧缂栧彿',
-            align: "center",
-            // sorter: true,
-            dataIndex: 'equipmentId'
-          },
-          {
-            title: '璁惧鍚嶇О',
-            align: "center",
-            // sorter: true,
-            dataIndex: 'equipmentName'
-          },
+          // {
+          //   title: '璁惧缂栧彿',
+          //   align: "center",
+          //   // sorter: true,
+          //   dataIndex: 'equipmentId'
+          // },
+          // {
+          //   title: '璁惧鍚嶇О',
+          //   align: "center",
+          //   // sorter: true,
+          //   dataIndex: 'equipmentName'
+          // },
           {
             title: '鎶ヨ鍙�',
             align: "center",
@@ -242,10 +255,10 @@
             dataIndex: 'alarmCode'
           },
           {
-            title: '鎶ヨ鎻忚堪',
+            title: '鎶ヨ鍐呭',
             align: "center",
             // sorter: true,
-            dataIndex: 'alarmDescription'
+            dataIndex: 'alarmContent'
           },
 
           {
@@ -254,11 +267,17 @@
             // sorter: true,
             dataIndex: 'driveType'
           },
+          // {
+          //   title: '鏄惁杩囨护',
+          //   align: "center",
+          //   dataIndex: 'isUse',
+          //   customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUse'], text) : ''),
+          // },
           {
+            dataIndex:'isUse_dictText',
             title: '鏄惁杩囨护',
             align: "center",
-            dataIndex: 'isUse',
-            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUse'], text) : ''),
+           // dictCode:'alarm_is_use'
           },
           {
             title: '鎿嶄綔',
@@ -270,9 +289,9 @@
           }
         ],
         url: {
-          list: "/mdc/alarmInfo/page",
-          delete: "/mdc/alarmInfo/delete",
-          deleteBatch: "/mdc/alarmInfo/deleteBatch",
+          list: "/mdc/mdcAlarmInfo/list",
+          delete: "/mdc/mdcAlarmInfo/delete",
+          deleteBatch: "/mdc/mdcAlarmInfo/deleteBatch",
           importExcelUrl: "mdc/mdcDriveTypeParamConfig/importExcel",
 
         },
@@ -281,7 +300,7 @@
       }
     },
     created() {
-      this.$set(this.dictOptions, 'isUse', [{ text: '鏄�', value: '1' }, { text: '鍚�', value: '2' }])
+      this.$set(this.dictOptions, 'isUse', [{ text: '鏄�', value: '0' }, { text: '鍚�', value: '-1' }])
       this.getSuperFieldList();
     },
     computed: {
@@ -305,9 +324,8 @@
       },
       getSuperFieldList() {
         let fieldList = [];
-        fieldList.push({ type: 'string', value: 'equipmentId', text: '璁惧缂栧彿', dictCode: '' })
         fieldList.push({ type: 'string', value: 'alarmCode', text: '鎶ヨ鍙�', dictCode: '' })
-        fieldList.push({ type: 'string', value: 'alarmDescription', text: '鎶ヨ鎻忚堪', dictCode: '' })
+        fieldList.push({ type: 'string', value: 'alarmDescription', text: '鎶ヨ鍐呭', dictCode: '' })
         fieldList.push({ type: 'int', value: 'driveType', text: '璁惧椹卞姩绫诲瀷', dictCode: '' })
         fieldList.push({ type: 'switch', value: 'isUse', text: '鏄惁杩囨护' })
         this.superFieldList = fieldList

--
Gitblit v1.9.3