From fdc1a316762723702be79740a68cc50c74efb9b2 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 4 Jun 2024 15:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=8A=E8=AD=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmRules/components/addRules.vue  |   6 +-
 .../jcsb/components/addjcsbDialog.vue         |   2 +-
 .../components/addmonitoringDialog.vue        |   2 +-
 src/views/homePage/warnMessage/index.vue      | 137 +++++++++++++++++-
 4 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/src/views/alarmRules/components/addRules.vue b/src/views/alarmRules/components/addRules.vue
index ae6c5957..ebc8079c 100644
--- a/src/views/alarmRules/components/addRules.vue
+++ b/src/views/alarmRules/components/addRules.vue
@@ -15,7 +15,11 @@
         :model="formInfo"
       >
         <el-form-item label="属性名称：">
-          <el-select v-model="formInfo.attribute" @change="changeAttribute">
+          <el-select
+            v-model="formInfo.attribute"
+            @change="changeAttribute"
+            :disabled="title == '编辑规则'"
+          >
             <el-option
               v-for="item in modevOptions"
               :key="item.id"
diff --git a/src/views/equipment/jcsb/components/addjcsbDialog.vue b/src/views/equipment/jcsb/components/addjcsbDialog.vue
index f797cd23..2b956574 100644
--- a/src/views/equipment/jcsb/components/addjcsbDialog.vue
+++ b/src/views/equipment/jcsb/components/addjcsbDialog.vue
@@ -69,7 +69,7 @@ export default {
       },
       rules: {
         name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-        devId: [{ required: true, message: "请输入devId", trigger: "blur" }],
+        // devId: [{ required: true, message: "请输入devId", trigger: "blur" }],
       },
       tableOptions: [],
       zsbInfo: "",
diff --git a/src/views/equipment/monitoring/components/addmonitoringDialog.vue b/src/views/equipment/monitoring/components/addmonitoringDialog.vue
index 0427f1f7..35107732 100644
--- a/src/views/equipment/monitoring/components/addmonitoringDialog.vue
+++ b/src/views/equipment/monitoring/components/addmonitoringDialog.vue
@@ -69,7 +69,7 @@ export default {
       },
       rules: {
         name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-        devId: [{ required: true, message: "请输入devId", trigger: "blur" }],
+        //devId: [{ required: true, message: "请输入devId", trigger: "blur" }],
       },
       tableOptions: [],
       zsbInfo: "",
diff --git a/src/views/homePage/warnMessage/index.vue b/src/views/homePage/warnMessage/index.vue
index dd47b749..9f84e2ac 100644
--- a/src/views/homePage/warnMessage/index.vue
+++ b/src/views/homePage/warnMessage/index.vue
@@ -14,7 +14,7 @@
       >
     </h3>
     <div class="cardContent">
-      <el-table
+      <!-- <el-table
         ref="restauranttable"
         :data="tableData"
         class="tableHi"
@@ -56,7 +56,34 @@
             <span v-else-if="scope.row.warnLevel == 0"> 低 </span>
           </template>
         </el-table-column>
-      </el-table>
+      </el-table> -->
+      <ul class="warntitle">
+        <li>报警时间</li>
+        <li>主设备名称</li>
+        <li>告警信息</li>
+
+        <li>当前值</li>
+        <li>触发条件</li>
+        <li>告警阈值</li>
+        <li>告警等级</li>
+      </ul>
+      <div class="marquee">
+        <ul class="scrollUl">
+          <li v-for="(item, index) in tableData" :key="index">
+            <span>{{ item.warnTime }}</span>
+            <span>{{ item.zsbName }}</span>
+            <span>{{ item.warnDesc }}</span>
+            <span>{{ item.warnValue }}</span>
+            <span>{{ item.triggerDesc }}</span>
+            <span>{{ item.threshold }}</span>
+            <span>
+              <span v-if="item.warnLevel == 2">高 </span>
+              <span v-else-if="item.warnLevel == 1"> 中 </span>
+              <span v-else-if="item.warnLevel == 0"> 低 </span></span
+            >
+          </li>
+        </ul>
+      </div>
     </div>
     <warnDialog ref="warnRef"></warnDialog>
   </div>
@@ -77,6 +104,8 @@ export default {
       starttime: "",
       endtime: "",
       params: {},
+      isMoving: true,
+      isDuplicated: true, // 用于判断是否添加复制的项
     };
   },
   created() {
@@ -98,8 +127,8 @@ export default {
     lookMore() {
       this.params.startTime = this.starttime;
       this.params.endTime = this.endtime;
-      this.params.pageSize = 1;
-      this.params.pageNum = 20;
+      this.params.pageSize = 20;
+      this.params.pageNum = 1;
       this.$refs.warnRef.display(this.params);
     },
     getwarnList() {
@@ -110,8 +139,8 @@ export default {
 
       this.params.startTime = this.starttime;
       this.params.endTime = this.endtime;
-      this.params.pageSize = 1;
-      this.params.pageNum = 20;
+      this.params.pageSize = 20;
+      this.params.pageNum = 1;
       warningListApi(this.params)
         .then((res) => {
           console.log(res);
@@ -128,6 +157,7 @@ export default {
 <style lang="less">
 .warnmessageBox {
   padding: 0px 10px;
+  height: 100%;
   h3 {
     height: 38px;
     line-height: 38px;
@@ -164,6 +194,101 @@ export default {
   }
   .cardContent {
     margin-top: 10px;
+    height: 100%;
+
+    .warntitle {
+      width: 100%;
+      display: flex;
+      line-height: 24px;
+      height: 24px;
+      border-bottom: 1px solid #eee;
+      align-items: center;
+      justify-content: space-around;
+      li {
+        list-style: none;
+        font-size: 12px;
+        text-align: center;
+        &:first-child {
+          width: 12%;
+        }
+        &:nth-child(2) {
+          width: 15%;
+        }
+        &:nth-child(3) {
+          width: 20%;
+        }
+        &:nth-child(4) {
+          width: 10%;
+        }
+        &:nth-child(5) {
+          width: 8%;
+        }
+        &:nth-child(6) {
+          width: 8%;
+        }
+        &:nth-child(7) {
+          width: 8%;
+        }
+      }
+    }
+    .marquee {
+      height: calc(100% - 80px);
+      display: flex;
+      overflow: hidden;
+      margin-top: 2px;
+      width: 100%;
+
+      .scrollUl {
+        animation: 10s scrollTop linear infinite; /* 根据需要调整动画时间和速度 */
+        width: 100%;
+
+        li {
+          list-style: none;
+          font-size: 12px;
+          text-align: center;
+          line-height: 24px;
+          height: 24px;
+          border-bottom: 1px solid #eee;
+          display: flex;
+          justify-content: space-around;
+          width: 100%;
+          span {
+            &:first-child {
+              width: 12%;
+            }
+            &:nth-child(2) {
+              width: 15%;
+            }
+            &:nth-child(3) {
+              width: 20%;
+            }
+            &:nth-child(4) {
+              width: 10%;
+            }
+            &:nth-child(5) {
+              width: 8%;
+            }
+            &:nth-child(6) {
+              width: 8%;
+            }
+            &:nth-child(7) {
+              width: 8%;
+            }
+          }
+        }
+      }
+    }
+
+    @keyframes scrollTop {
+      0% {
+        -webkit-transform: translate3d(0, 0, 0);
+        transform: translate3d(0, 0, 0);
+      }
+      100% {
+        -webkit-transform: translate3d(0, -100%, 0);
+        transform: translate3d(0, -100%, 0);
+      }
+    }
 
     .el-table th.el-table__cell {
       background-color: transparent;