合并分支 'fxf1' 到 'plus1.1.0'

fix():指标预警改为滚动显示查看合并请求 !7

合并分支 'fxf1' 到 'plus1.1.0'
6cc17ea4 · 冯小芳 · 5d3da792 · 4aba7f41 · 6cc17ea4 · 6cc17ea4
--- a/src/views/dataCenter/map/model/indicatorWarning/index.vue
+++ b/src/views/dataCenter/map/model/indicatorWarning/index.vue
@@ -14,41 +14,49 @@
        </div>
      </div>
      <div class="contentBox">
-        <div class="table-list">
+        <el-carousel
-          <el-row
+          height="200px"
-            class="table_cell"
+          trigger="click"
-            v-for="(item, index) in tableData"
+          :loop="true"
-            :key="index"
+          :interval="2500"
-            :dataIndex="index"
+          direction="vertical"
-          >
+          :autoplay="true"
-            <el-col :span="6">
+        >
-              <div class="num">
+          <el-carousel-item v-for="(data, idx) in carouselData" :key="idx">
-                <div>{{ item.num }}</div>
+            <el-row
-              </div>
+              class="table-list"
-            </el-col>
+              v-for="(item, index) in data"
-            <el-col :span="6">
+              :key="index"
-              <div class="grade-box">
+            >
-                <img
+              <el-col :span="6">
-                  v-if="item.grade == 1"
+                <div class="num">
-                  src="../../../../../assets/img/grade1.png"
+                  <div>{{ item.num }}</div>
-                  class="grade-icon"
-                />
-                <img
-                  v-else
-                  src="../../../../../assets/img/grade2.png"
-                  class="grade-icon"
-                />
-                <div
-                  class="name"
-                  :style="{ color: gradeType[item.grade].color }"
-                >
-                  {{ gradeType[item.grade].name }}
                </div>
-              </div>
+              </el-col>
-            </el-col>
+              <el-col :span="6">
-            <el-col :span="12">{{ item.event }}</el-col>
+                <div class="grade-box">
-          </el-row>
+                  <img
-        </div>
+                    v-if="item.grade == 1"
+                    src="../../../../../assets/img/grade1.png"
+                    class="grade-icon"
+                  />
+                  <img
+                    v-else
+                    src="../../../../../assets/img/grade2.png"
+                    class="grade-icon"
+                  />
+                  <div
+                    class="name"
+                    :style="{ color: gradeType[item.grade].color }"
+                  >
+                    {{ gradeType[item.grade].name }}
+                  </div>
+                </div>
+              </el-col>
+              <el-col :span="12">{{ item.event }}</el-col>
+            </el-row>
+          </el-carousel-item>
+        </el-carousel>
      </div>
    </div>
  </div>
@@ -72,6 +80,15 @@ export default {
    tableData() {
      return Mock[this.curDataType];
    },
+    carouselData() {
+      let carouselData = [];
+      for (let i = 0; i < this.tableData.length; i += 5) {
+        const list = this.tableData.slice(i, i + 5);
+        carouselData.push(list);
+      }
+      console.log(carouselData);
+      return carouselData;
+    },
  },
  data() {
    return {
@@ -115,7 +132,7 @@ export default {
  height: 40px;
  font-weight: bold;
  font-size: 14px;
-  background-color: #0e4781 !important;
+  background-color: #3395ff30 !important;
  .tableBox {
    color: #ffffff;
@@ -130,52 +147,40 @@ export default {
      padding: 8px 0;
      line-height: 23px;
    }
-    .el-row {
-      border-bottom: 1px dashed #10529a;
-    }
  }
 }
 .contentBox {
  color: #fff;
  font-size: 16px;
-  //   height: 200px;
+  .el-row {
+    padding: 0 24px 0 20px;
-  .table-list {
+    display: flex;
-    width: 100%;
+    align-items: center;
-    height: 100%;
+  }
-    overflow: hidden;
+  .el-row:nth-child(even) {
-    .el-row {
+    background-color: #3395ff13;
-      padding: 0 20px;
+  }
-      //   border-bottom: 1px dashed #10529a;
+  .el-col {
-      display: flex;
+    color: #d4f7ff;
-      align-items: center;
+    font-size: 12px;
-    }
+    padding: 8px 0;
-    .el-row:nth-child(even) {
+    line-height: 18px;
-      background-color: #3395ff30;
+  }
-    }
+  .num {
-    .el-col {
+    font-family: "YouSheBiaoTiHei";
-      color: #d4f7ff;
+    color: #ffffff;
-      font-size: 12px;
+    font-size: 17px;
-      padding: 8px 0;
+  }
-      line-height: 18px;
+  .grade-box {
+    display: flex;
+    align-items: center;
+    .grade-icon {
+      width: 15px;
    }
-    .num {
+    .name {
+      margin-left: 10px;
      font-family: "YouSheBiaoTiHei";
-      color: #ffffff;
+      font-size: 16px;
-      font-size: 17px;
-    }
-    .grade-box {
-      display: flex;
-      align-items: center;
-      .grade-icon {
-        width: 15px;
-      }
-      .name {
-        margin-left: 10px;
-        font-family: "YouSheBiaoTiHei";
-        font-size: 16px;
-      }
    }
  }
 }

--- a/src/views/dataCenter/map/model/indicatorWarning/mock.js
+++ b/src/views/dataCenter/map/model/indicatorWarning/mock.js
@@ -15,6 +15,12 @@ export default {
    {
      num: 16, grade: 2, event: "军民需求对接活动偏少",
    },
+    {
+      num: 17, grade: 1, event: "部分县市区未严格落实组织管理体系建设要求",
+    },
+    {
+      num: 24, grade: 1, event: "部分县市区任务落实不力",
+    },
  ],
  "2022One": [
@@ -33,6 +39,12 @@ export default {
    {
      num: 16, grade: 2, event: "军民需求对接活动偏少",
    },
+    {
+      num: 17, grade: 1, event: "部分县市区未严格落实组织管理体系建设要求",
+    },
+    {
+      num: 24, grade: 1, event: "部分县市区任务落实不力",
+    },
  ],
  "typeFour": [
    {
@@ -50,6 +62,12 @@ export default {
    {
      num: 16, grade: 2, event: "军民需求对接活动偏少",
    },
+    {
+      num: 17, grade: 1, event: "部分县市区未严格落实组织管理体系建设要求",
+    },
+    {
+      num: 24, grade: 1, event: "部分县市区任务落实不力",
+    },
  ],
  "typeThree": [
    {
@@ -67,6 +85,12 @@ export default {
    {
      num: 16, grade: 2, event: "军民需求对接活动偏少",
    },
+    {
+      num: 17, grade: 1, event: "部分县市区未严格落实组织管理体系建设要求",
+    },
+    {
+      num: 24, grade: 1, event: "部分县市区任务落实不力",
+    },
  ],
  "typeTwo": [
    {
@@ -84,6 +108,12 @@ export default {
    {
      num: 16, grade: 2, event: "军民需求对接活动偏少",
    },
+    {
+      num: 17, grade: 1, event: "部分县市区未严格落实组织管理体系建设要求",
+    },
+    {
+      num: 24, grade: 1, event: "部分县市区任务落实不力",
+    },
  ],