修改优化告警

src/layout/components/Search/index.vue

@@ -13,6 +13,24 @@
         {{ title }}
       </div>
       <div v-if="isOnly" class="content flex-wrap">
+        <el-select v-model="value" clearable placeholder="请选择" v-if="isSou">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select v-model="value1" clearable placeholder="请选择" v-if="isSou">
+          <el-option
+            v-for="item in options1"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
         <div
           v-if="isSearch"
           :class="isChild ? 'childSearch' : ''"
@@ -84,6 +102,11 @@ export default {
       type: Boolean,
       default: true,
     },
+    //是否下拉
+    isSou: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -92,7 +115,16 @@ export default {
   },
   methods: {
     checkSearch() {
-      this.$emit("getSearchData", this.input);
+      if (isSou) {
+        let params = {
+          input: this.input,
+          value1: this.value1,
+          value: this.value,
+        };
+        this.$emit("getSearchData", params);
+      } else {
+        this.$emit("getSearchData", this.input);
+      }
     },
     clearSearch() {
       this.$emit("clearSearchData", this.input);
@@ -113,6 +145,22 @@ export default {
       margin-right: 0;
     }
   }
+  ::v-deep .el-select {
+    width: 136px;
+    .el-input__suffix {
+      right: 5px;
+      top: 2px;
+    }
+    .el-input__inner {
+      font-size: 14px;
+      font-family: Microsoft YaHei;
+      font-weight: 400;
+      color: #101116;
+    }
+    // .el-icon-arrow-up:before {
+    //   content: "\f057";
+    // }
+  }
   .title {
     line-height: 36px;
     font-size: 20px;

src/styles/index.scss

@@ -200,6 +200,17 @@ li {
   font-weight: 300;
   color: #101611
 }
+.flower{
+  overflow:hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow:ellipsis;
+}
+.fwgh{
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #101116;
+}
 .right {
   text-align: right;
 }

src/views/BasicsData/views/airport/airportInfo.vue

@@ -475,7 +475,7 @@ export default {
     // 内容跳转
     toTink(item) {
       this.$router.push({
-        path: "/dashboard/airportInfoDetails",
+        path: "/BasicsData/airportInfoDetails",
         query: {
           id: item.id,
           name: item.name,

src/views/BasicsData/views/airport/airportInfoDetails.vue

@@ -146,6 +146,7 @@
         <Search
           :isSlot="false"
           :isChild="true"
+          :isSou="true"
           title="行李追踪位置信息"
           @clearSearchData="clearSearchData"
           @getSearchData="getSearchData"

src/views/systemSettings/views/warningSet/warningEdit.vue

@@ -72,7 +72,7 @@
 
           <div class="aviName2">
             <div class="aviP3">备注</div>
-            <el-input type="textarea" v-model="desc"></el-input>
+            <el-input type="textarea" v-model="desc" resize="none"></el-input>
           </div>
         </div>
       </div>
@@ -88,13 +88,42 @@
       />
 
       <div class="LBox">
-        <div @click="addDig" class="lbox-add r24">
+        <!-- <div @click="addDig" class="lbox-add r24">
           <div class="terminal-info-add-icons">
             <span class="icon el-icon-plus"></span>
           </div>
-        </div>
-
-        <div
+        </div> -->
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <div @click="addDig" class="lbox-add r24">
+              <div class="terminal-info-add-icons">
+                <span class="icon el-icon-plus"></span>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="4" v-for="(item, index) in infoArr" :key="index">
+            <div class="headerBoxs">
+              <div class="tltle-head">
+                <div class="title flower">
+                  {{ item.name }}
+                </div>
+                <div
+                  @click="delBox(item, index)"
+                  class="el-icon-close icon"
+                ></div>
+              </div>
+              <div class="text item" style="margin-top: 15px">
+                <div class="adTime fwgh" style="margin-bottom: 15px">
+                  预警时长:<span class="timeER">{{ item.beginTime }}</span>
+                </div>
+                <div class="adTime fwgh">
+                  报警时长:<span class="timeER">{{ item.endTime }}</span>
+                </div>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+        <!-- <div
           v-for="(item, index) in infoArr"
           @click="infoIndex(item, index)"
           :key="index"
@@ -103,14 +132,13 @@
           <div class="name">{{ item.name }}</div>
           <div class="edit right">
             <span @click.stop="editInfo(item)" class="round">
-              <!-- <i class="el-icon-edit-outline"></i> -->
               <div class="edit_log" style="margin-left: 0"></div>
             </span>
           </div>
           <div @click.stop="delBox(item)" class="close">
             <i class="el-icon-close"></i>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
 
@@ -120,10 +148,17 @@
         <div class="del-title">删除报警预警策略</div>
         <div class="content er">
           <div class="log"></div>
-          是否确认删除{{ this.delName }}超时策略
+          是否确认删除
+          <p style="color: #eb2f3b; margin-top: 0px; margin-bottom: 0px">
+            {{ this.delName }}?
+          </p>
         </div>
         <div class="DelFoot right t30" style="background: #ffffff">
-          <el-button size="medium" @click="remove" class="r25 r26" type="danger"
+          <el-button
+            size="medium"
+            @click="remove"
+            class="r25 buwitch"
+            type="danger"
             >删除</el-button
           >
           <el-button size="medium" class="r26" @click="flag = false"
@@ -232,7 +267,7 @@
               </el-select>
             </el-form-item>
           </div>
-          <div class="itemBox">
+          <!-- <div class="itemBox">
             <el-form-item label="备注">
               <el-input
                 @input="changeValue3"
@@ -240,7 +275,7 @@
                 v-model="form.desc"
               ></el-input>
             </el-form-item>
-          </div>
+          </div> -->
         </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button type="primary" class="r25 r26" @click="submit"
@@ -284,7 +319,11 @@ export default {
       code4: this.$route.query.ladingAirport,
       flag: false,
       aircompeny: [],
-      infoArr: [], //报警预警策略列表
+      infoArr: [
+        {
+          name: "名称",
+        },
+      ], //报警预警策略列表
       posType: 1,
       arilist: [],
       traceList: [],
@@ -356,12 +395,12 @@ export default {
     };
   },
   created() {
-    this.getAirlines();
-    this.getAirlist();
-    this.UserWarning();
-    this.tracenode();
-    this.AlarmlocationList(this.code3, "1");
-    this.AlarmlocationList(this.code4, "2");
+    // this.getAirlines();
+    // this.getAirlist();
+    // this.UserWarning();
+    // this.tracenode();
+    // this.AlarmlocationList(this.code3, "1");
+    // this.AlarmlocationList(this.code4, "2");
   },
   watch: {
     code3() {
@@ -483,7 +522,7 @@ export default {
       const res = await AddWarning(params);
       if (res.code === 0) {
         this.$message.success("修改报警预警信息成功");
-        this.$router.push("/dashboard/warningSet");
+        this.$router.push("/systemSettings/warningSet");
       } else {
         this.$message.error.message;
       }
@@ -607,6 +646,7 @@ export default {
 .bgBox {
   padding: 0;
   width: 100%;
+
   .log {
     width: 26px;
     height: 26px;
@@ -622,10 +662,19 @@ export default {
   }
   ::v-deep .el-input__suffix {
     right: 0;
-    top: 5px;
   }
   ::v-deep .el-dialog__body {
-    padding-left: 0;
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+    // padding-top: 20px !important;
+    padding-bottom: 0px;
+  }
+  ::v-deep .el-dialog__headerbtn {
+    top: 17px;
+    color: #ffffff;
+  }
+  ::v-deep .el-dialog__close {
+    color: #ffffff;
   }
   ::v-deep .el-range-separator {
     line-height: 27px;
@@ -650,6 +699,46 @@ export default {
     margin-bottom: 15px;
   }
 }
+.timeER {
+  font-size: 14px;
+  font-family: Helvetica;
+  font-weight: 400;
+  color: #afb4bf;
+}
+.box-card {
+  width: 268px;
+  height: 144px;
+  margin-left: 18px;
+  margin-top: 24px;
+  background: #fff;
+  box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+  border-radius: 4px;
+}
+.headerBox {
+  padding: 16px;
+  display: flex;
+  justify-content: space-between;
+  .tltle-head {
+    display: flex;
+    width: 100%;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  .el-button {
+    width: 64px;
+    height: 32px;
+    background: #2d67e3;
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 14px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #ffffff;
+  }
+}
 .text {
   font-size: 14px;
 }
@@ -669,18 +758,22 @@ export default {
   border-radius: 8px;
 }
 .topBox {
-  height: 280px;
+  // height: 280px;
   background: #ffffff;
   box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
   border-radius: 4px;
   margin-bottom: 25px;
 }
-.headerBox {
-  padding: 32px 40px 20px 32px;
+.headerBoxs {
+  height: 144px;
+  padding: 24px 24px 20px 18px;
   background: #ffffff;
-  display: flex;
   border-radius: 4px;
-  justify-content: space-between;
+  .tltle-head {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
   .el-button {
     width: 64px;
     height: 32px;
@@ -698,19 +791,20 @@ export default {
 
 .top {
   display: flex;
+  align-items: center;
   flex-direction: row;
 }
 
 .oneColor {
   width: 4px;
-  height: 26px;
+  height: 20px;
   margin-right: 12px;
-  background: #6e82a7;
+  background: #2d67e3;
 }
 .titleOne {
   width: 144px;
-  height: 24px;
-  font-size: 24px;
+  font-size: 20px;
+  font-family: Microsoft YaHei;
   font-weight: bold;
   color: #303133;
 }
@@ -719,6 +813,12 @@ export default {
   display: flex;
   flex-wrap: wrap;
   width: 90%;
+  ::v-deep .el-input__suffix {
+    top: 4px;
+  }
+}
+::v-deep .el-row {
+  width: 100%;
 }
 ::v-deep .formBox {
   .digName {
@@ -825,9 +925,9 @@ export default {
 .centerBox {
   height: 495px;
   padding: 32px 40px 44px 32px;
-  background: #ffffff;
-  box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
-  border-radius: 4px;
+  // background: #ffffff;
+  // box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
+  // border-radius: 4px;
 }
 .centerTitle {
   width: 126px;
@@ -873,8 +973,7 @@ export default {
   margin-bottom: 20px;
 }
 .lbox-add {
-  width: 230px;
-  height: 120px;
+  height: 144px;
   background: #f5f7fa;
   border: 1px dashed #9ebbf7;
   border-radius: 8px;
@@ -983,8 +1082,19 @@ export default {
   }
   .el-dialog {
     // border-radius: 20px;
-    width: 650px;
-    height: 515px;
+    width: 600px;
+    display: flex;
+    display: -ms-flex; /* 兼容IE */
+    flex-direction: column;
+    -ms-flex-direction: column; /* 兼容IE */
+    margin: 0 !important;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    max-height: calc(100% - 30px);
+    max-width: calc(100% - 30px);
+    // height: 515px;
   }
   .el-input__inner {
     width: 160px;
@@ -1003,6 +1113,11 @@ export default {
   .el-dialog__header {
     padding: 35px 46px 10px;
   }
+  .el-dialog__footer {
+    padding-left: 0px;
+    padding-right: 0px;
+    padding-bottom: 0;
+  }
   .el-dialog__title {
     font-size: 24px;
     font-weight: bold;
@@ -1010,10 +1125,13 @@ export default {
   }
 
   .dialog-footer {
+    height: 56px;
     display: flex;
     justify-content: flex-end;
+    align-items: center;
     padding-right: 34px;
-    margin-top: -30px;
+    background: #f0f5ff;
+    padding-bottom: 0;
   }
 }
-</style>
+</style>

src/views/systemSettings/views/warningSet/warningSet.vue

@@ -23,6 +23,7 @@
           class="box-card"
           v-for="(item, index) in warningArr"
           :key="index"
+          style="padding-left: 24px; padding-right: 24px"
         >
           <div class="headerBox">
             <div class="tltle-head">
@@ -31,13 +32,9 @@
               </div>
               <div @click="gotoAram(item, index)" class="edit_log"></div>
             </div>
-            <div
-              @click="delBtn(item, index)"
-              class="el-icon-close icon"
-              style="margin-left: 10px; margin-top: 5px"
-            ></div>
+            <div @click="delBtn(item, index)" class="el-icon-close icon"></div>
           </div>
-          <div class="text item" style="margin-top: 15px">
+          <div class="text item" style="margin-top: 6px">
             <div class="adTime">
               生效时间：<span class="timeSt">{{ item.beginTime }}</span>
             </div>
@@ -428,7 +425,7 @@ export default {
     },
     gotoAram(item, index) {
       this.$router.push({
-        path: "/dashboard/warningEdit",
+        path: "/systemSettings/warningEdit",
         query: {
           id: item.id,
           airportCode2: item.airportCode2,
@@ -490,7 +487,7 @@ export default {
   flex-direction: row;
   font-weight: bold;
   margin-bottom: 14px;
-  margin-left: 10px;
+  // margin-left: 10px;
   font-size: 14px;
   font-family: Microsoft YaHei;
   font-weight: 400;
@@ -507,7 +504,8 @@ export default {
   display: flex;
 }
 .headerBox {
-  padding: 16px;
+  padding-top: 24px;
+  padding-bottom: 24px;
   display: flex;
   justify-content: space-between;
   .tltle-head {
@@ -559,14 +557,26 @@ export default {
 
 ::v-deep .EditDig {
   .el-dialog {
-    width: 650px;
+    width: 600px;
     height: 450px;
     border-radius: 2px;
+    display: flex;
+    display: -ms-flex; /* 兼容IE */
+    flex-direction: column;
+    -ms-flex-direction: column; /* 兼容IE */
+    margin: 0 !important;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    max-height: calc(100% - 30px);
+    max-width: calc(100% - 30px);
     .el-dialog__body {
       padding: 20px 20px 0 20px !important;
     }
     .el-dialog__footer {
-      padding: 0 24px 0 24px !important;
+      padding: 0 19px 0 0;
+      background: #f0f5ff;
     }
     .dialog-footer {
       width: 100%;
@@ -642,7 +652,7 @@ export default {
     border-radius: 4px;
   }
   .digName3 .el-textarea__inner {
-    width: 500px;
+    width: 455px;
     height: 96px;
     margin-left: 16px;
     background: #ffffff;