Merge branch 'dev' of https://app.bmetech.com/liuzhaohui/dctomproject into dev

src/request/index.js

@@ -7,11 +7,13 @@ const ENV = import.meta.env
 
 const requestObj = {};
 
+const source = axios.CancelToken.source()
 const service = axios.create({
   headers: {
     "Content-Type": "application/json",
     "X-Requested-With": "XMLHttpRequest"
-  }
+  },
+  cancelToken: source.token
 });
 
 service.interceptors.request.use(

src/views/closeManage/components/dialog.vue

@@ -91,14 +91,14 @@ const handleSave = ()=> {
   width: 100%;
   .real-btn {
     width: auto;
-    height: 28px;
+    height: 32px;
     background: rgb(64, 158, 255);
     border: 1px solid rgb(64, 158, 255);
     border-radius: 4px;
     box-shadow: 0 1px 9px 0 rgba(12, 123, 255, 0.3) inset;
     text-align: center;
     padding: 0 16px;
-    line-height: 28px;
+    line-height: 32px;
     color: rgba(255, 255, 255, 0.85);
     margin-right: 16px;
     cursor: pointer;

src/views/closeManage/myDone.vue

@@ -4,6 +4,7 @@
       <el-form-item label="事件名称：">
         <el-select v-model="formInline.eventNameId"
                    placeholder="请选择"
+                   style="width: 280px"
         >
           <el-option
               v-for="(item, index) in basicConfiguration.ticketEventName"
@@ -20,17 +21,20 @@
       <el-form-item label="所属区域：">
         <el-select v-model="formInline.branchFactoryIds"
                    placeholder="请选择"
+                   style="width: 180px"
         >
-          <el-option label="全部" value="" />
           <el-option v-for="(item, index) in basicConfiguration.branchFactoryList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id"
+                     :key="item.branchFactoryId"
+                     :label="item.branchFactory"
+                     :value="item.branchFactoryId"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="设备类型">
-        <el-select v-model="formInline.deviceType">
+        <el-select v-model="formInline.deviceType"
+                   style="width: 180px"
+                   placeholder="请选择"
+        >
           <el-option label="全部" value="" />
           <el-option
               v-for="(item, index) in basicConfiguration.deviceList"
@@ -42,14 +46,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="发生时间">
-        <el-date-picker type="daterange"
+        <el-date-picker type="datetimerange"
                         v-model="formInline.createTime"
                         range-separator="至"
                         start-placeholder="开始日期"
                         end-placeholder="结束日期"
                         format="YYYY-MM-DD HH:mm:ss"
-                        date-format="YYYY/MM/DD ddd"
-                        time-format="A hh:mm:ss"
+                        value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
       <el-form-item>
@@ -935,42 +938,7 @@ const changeBag = (data)=>{
 
 }
 
-const tableData = [
-  {
-    id: 1,
-    name: '张三',
-    phone: '13888888888',
-    email: '<EMAIL>',
-    branchFactory: '上海分公司',
-    deviceType: '烟感',
-    eventTime: '2021-09-09 12:00:00',
-    eventStatus: '已处理',
-    eventDetail: '设备报警',
-    level: 1
-  },
-  {
-    id: 2,
-    name: '张三',
-    phone: '13888888888',
-    email: '<EMAIL>',
-    branchFactory: '上海分公司',
-    deviceType: '烟感',
-    eventTime: '2021-09-09 12:00:00',
-    eventStatus: '已处理',
-    eventDetail: '设备报警',
-    level: 2
-  },
-  {
-    id: 3,
-    name: '张三',
-    phone: '13888888888',
-    email: '<EMAIL>',
-    branchFactory: '上海分公司',
-    deviceType: '烟感',
-    eventTime: '20',
-    level: 3
-  }
-];
+const tableData = ref([]);
 
 const tableColumns = ref([
   {
@@ -1051,8 +1019,9 @@ const getWarnAndTicketConfigMap = ()=> {
   }
   getDataFun(url,params).then(res => {
     if (res && res.code === 1) {
-      const { ticketEventName, eventType } = res.data;
+      const { ticketEventName, deviceType } = res.data;
       basicConfiguration.ticketEventName = basicConfiguration.ticketEventName.concat(ticketEventName);
+      basicConfiguration.deviceList = deviceType;
     }
   });
 };
@@ -1143,9 +1112,9 @@ const disposeType = (list)=> {
 }
 
 onMounted(() => {
-  // getBranchTypeList();
-  // getWarnAndTicketConfigMap();
-  // searchData();
+  getBranchTypeList();
+  getWarnAndTicketConfigMap();
+  searchData();
 });
 
 const currentPage = ref(1);
@@ -1176,6 +1145,9 @@ const handlePaginationChange = (pagination) => {
     color: #fff;
     text-align: center;
   }
+  .table-box {
+    height: calc(100vh - 200px);
+  }
   .yellow {
     // color: #faa508;
     position: relative;
@@ -1186,9 +1158,8 @@ const handlePaginationChange = (pagination) => {
       border-radius: 50%;
       background: #ffb224;
       position: absolute;
-      left: 50%;
-      top: 50%;
-      transform: translate(-50%);
+      left: 0;
+      top: 6px;
     }
   }
   .red {
@@ -1200,9 +1171,8 @@ const handlePaginationChange = (pagination) => {
       border-radius: 50%;
       background: #db001d;
       position: absolute;
-      left: 50%;
-      top: 50%;
-      transform: translate(-50%);
+      left: 0;
+      top: 6px;
     }
   }
 
@@ -1215,9 +1185,8 @@ const handlePaginationChange = (pagination) => {
       border-radius: 50%;
       background: #aa05fa;
       position: absolute;
-      left: 50%;
-      top: 50%;
-      transform: translate(-50%);
+      left: 0;
+      top: 6px;
     }
   }
   .view-btn {

src/views/dustMonitoring/components/warn.vue

+<template>
+  <div class="title layout1">
+    <span>告警：</span>
+    <span class="jump-icon">>></span>
+  </div>
+  <div class="content">
+    <div class="item" v-for="item in listInfo" :key="item.id">
+        {{item.info}}
+    </div>
+  </div>
+</template>
+<script setup>
+const props = defineProps({
+  listInfo: {
+    type: Array,
+    default: () => [],
+  },
+});
+</script>
+<style scoped lang="scss">
+.title {
+ height: 20px;
+ .jump-icon {
+    font-weight: bold;
+    color: #018796;
+ }
+}
+.content {
+    width: 100%;
+    height: calc(15vh - 30px);
+    padding: 10px 0px 10px 30px;
+    box-sizing: border-box;
+    overflow-y: auto;
+    .item {
+        width: 100%;
+    }
+}
+
+.content::-webkit-scrollbar {
+  width: 2px;
+  background-color: rgba(13, 15, 18, 0.1);
+}
+ 
+.layout1 {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+</style>
\ No newline at end of file