升降机、卸料平台联调

src/api/index.js

@@ -348,6 +348,73 @@ export function getDeviceCurrentStatus(params) {
 }
 
 
+// unloadingplatform
 
 
+export function getUnloadingPlatformList() {
+    return request({
+        url: '/pweb/s/unload/device/list',
+        method: 'get',
+    })
+}
+export function getPlatformCurrentStatus(params) {
+    return request({
+        url: '/pweb/s/unload/device/realdata',
+        method: 'get',
+        params
+    })
+}
+export function getPlatformRunningAnalysis(params) {
+    return request({
+        url: '/pweb/s/unload/device/statistics',
+        method: 'get',
+        params
+    })
+}
+export function getPlatformWarningStatus() {
+    return request({
+        url: '/pweb/s/unload/warning/statistics',
+        method: 'get'
+    })
+}
+export function getPlatformWarningList(params) {
+    return request({
+        url: '/pweb/s/unload/warning',
+        method: 'get',
+        params
+    })
+}
+
+
+//elevator
+export function getElevatorList() {
+    return request({
+        url: '/pweb/s/elevator/device/list',
+        method: 'get'
+    })
+}
+export function getElevatorWarningList(params) {
+    return request({
+        url: '/pweb/s/elevator/warning',
+        method: 'get',
+        params
+    })
+}
+
+export function getElevatorWarningStatus() {
+    return request({
+        url: '/pweb/s/elevator/warning/statistics',
+        method: 'get',
+    })
+}
+
+
+export function getElevatorRealData(params) {
+    return request({
+        url: '/pweb/s/elevator/device/realdata',
+        method: 'get',
+        params
+    })
+}
+
 

src/components/fallprotection/Index.vue

@@ -208,7 +208,7 @@ export default {
             resizeEnable: true,
             mapStyle: "amap://styles/darkblue",
           });
-          this.map.on("click", (e) => {
+          this.map.on("click", () => {
             this.buildingWindowVisible = false;
           });
           this.getBuildingList();

src/components/noise/Index.vue

@@ -124,10 +124,9 @@
         <div class="warning-table">
           <div class="warning-table-header">
             <div class="warning-table-time">报警时间</div>
-            <div class="warning-table-pm25">PM2.5</div>
-            <div class="warning-table-pm10">PM10</div>
-            <div class="warning-table-noise">噪音</div>
-            <div class="warning-table-wind">风速</div>
+            <div class="warning-table-device">设备</div>
+            <div class="warning-table-message">报警信息</div>
+            <div class="warning-table-status">处理状态</div>
           </div>
           <div class="warning-table-list" v-infinite-scroll="load">
             <div
@@ -136,10 +135,16 @@
               :key="index"
             >
               <div class="warning-table-time">{{ column.log_time }}</div>
-              <div class="warning-table-pm25"></div>
-              <div class="warning-table-pm10"></div>
-              <div class="warning-table-noise"></div>
-              <div class="warning-table-wind"></div>
+              <div class="warning-table-device"></div>
+              <div class="warning-table-message">
+                {{ column.alarm_content }}
+              </div>
+              <div
+                class="warning-table-status"
+                :style="{ color: column.status == 1 ? '#FFC74C' : '' }"
+              >
+                {{ column.status_text }}
+              </div>
             </div>
           </div>
         </div>
@@ -576,7 +581,7 @@ export default {
 }
 #aqi-chart {
   width: 100%;
-  height: 214px;
+  height: 154px;
 }
 .monitor {
   display: flex;
@@ -775,11 +780,10 @@ export default {
   .warning-table-time {
     width: 40%;
   }
-  .warning-table-pm25,
-  .warning-table-pm10,
-  .warning-table-noise,
-  .warning-table-wind {
-    width: 15%;
+  .warning-table-device,
+  .warning-table-message,
+  .warning-table-status {
+    width: 20%;
   }
 }
 #stats-container {

src/components/tower/Index.vue

@@ -12,7 +12,7 @@
       <ShadowContainer>
         <div id="force-chart" ref="forceChart"></div>
       </ShadowContainer>
-      <Title text="各塔吊24h倾角统计"></Title>
+      <Title text="各塔吊24h载重统计"></Title>
       <ShadowContainer>
         <div id="dip-chart" ref="dipChart"></div>
       </ShadowContainer>
@@ -45,7 +45,7 @@
             />
           </span>
         </div>
-        <div class="recent-open">最近使用:{{ windowData.log_time }}</div>
+        <!-- <div class="recent-open">最近使用:{{ windowData.log_time }}</div> -->
       </div>
       <div class="swagger-container" id="container">
         <img class="lt" src="@/assets/lt.png" alt="" />
@@ -56,35 +56,6 @@
       </div>
     </div>
     <div class="side-area">
-      <Title text="报警信息"></Title>
-      <ShadowContainer>
-        <div class="warn-message">
-          <div class="warn-icon" v-if="warnings.length == 0">
-            <img src="@/assets/no-message.png" alt="" />
-            <div>暂无信息~</div>
-          </div>
-          <div class="warp" v-else v-infinite-scroll="load">
-            <div
-              class="warn-title"
-              v-for="(warn, index) in warnings"
-              :key="index"
-            >
-              <div class="warn-text">
-                <el-tooltip
-                  class="item"
-                  effect="dark"
-                  :content="`${warn.alarm_content}(${warn.device_no})`"
-                >
-                  <div class="overflowed">
-                    {{ warn.alarm_content }}({{ warn.device_no }})
-                  </div>
-                </el-tooltip>
-              </div>
-              <div class="warn-time">{{ warn.log_time }}</div>
-            </div>
-          </div>
-        </div>
-      </ShadowContainer>
       <Title text="设备列表"></Title>
       <ShadowContainer>
         <div class="monitor-list">
@@ -112,6 +83,50 @@
           </div>
         </div>
       </ShadowContainer>
+      <Title text="报警信息"></Title>
+      <ShadowContainer>
+        <div class="warning-table">
+          <div class="warning-table-header">
+            <div class="warning-table-run-time">运行时间</div>
+            <div class="warning-table-device">设备</div>
+            <div class="warning-table-info">报警信息</div>
+            <div class="warning-table-status">处理状态</div>
+          </div>
+          <div class="warning-table-list" v-infinite-scroll="load">
+            <div
+              class="warning-table-column"
+              v-for="(column, index) in warnings"
+              :key="index"
+            >
+              <div class="warning-table-run-time">{{ column.log_time }}</div>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="column.device_no"
+                placement="top"
+              >
+                <div class="warning-table-device">{{ column.device_no }}</div>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="column.alarm_content"
+                placement="top"
+              >
+                <div class="warning-table-info">
+                  {{ column.alarm_content }}
+                </div>
+              </el-tooltip>
+              <div
+                class="warning-table-status"
+                :style="{ color: column.status == 1 ? '#FFC74C' : '#22C3ED' }"
+              >
+                {{ column.status_text }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </ShadowContainer>
     </div>
 
     <device-dialog
@@ -258,7 +273,7 @@ export default {
       });
       const seriesData = this.towerData.map((series) => {
         return {
-          name: series.name,
+          name: series.device_no,
           type: "line",
           smooth: true,
           data: series.data.map((item) => {
@@ -284,7 +299,7 @@ export default {
           },
         },
         tooltip: {
-          trigger: "item",
+          trigger: "axis",
         },
         xAxis: {
           type: "category",
@@ -296,6 +311,11 @@ export default {
           },
         },
         yAxis: {
+          name: "力矩/%",
+          nameTextStyle: {
+            color: "#C6DEF9",
+            nameLocation: "start",
+          },
           type: "value",
           axisLabel: {
             fontSize: "12",
@@ -327,11 +347,11 @@ export default {
       });
       const seriesData = this.towerData.map((series) => {
         return {
-          name: series.name,
+          name: series.device_no,
           type: "line",
           smooth: true,
           data: series.data.map((item) => {
-            return item.dip_angle;
+            return item.load;
           }),
         };
       });
@@ -352,6 +372,9 @@ export default {
             color: "rgba(225, 239, 255, 0.7)",
           },
         },
+        tooltip: {
+          trigger: "axis",
+        },
         xAxis: {
           type: "category",
           data: xAxisData,
@@ -362,6 +385,11 @@ export default {
           },
         },
         yAxis: {
+          name: "载重/t",
+          nameTextStyle: {
+            color: "#C6DEF9",
+            nameLocation: "start",
+          },
           type: "value",
           axisLabel: {
             fontSize: "12",
@@ -840,7 +868,6 @@ export default {
 
 .towerwindow {
   width: 460px;
-  height: 90px;
   position: absolute;
   left: 50%;
   top: 50%;
@@ -859,8 +886,6 @@ export default {
   line-height: 32px;
   font-size: 18px;
   color: #c6def9;
-  padding-bottom: 16px;
-  border-bottom: 1px solid #7a8fad;
   img {
     width: 32px;
     vertical-align: top;
@@ -872,4 +897,40 @@ export default {
     color: rgba(62, 236, 111, 1);
   }
 }
+
+.warning-table {
+  font-size: 14px;
+  text-align: center;
+  color: #c6def9;
+  .warning-table-list {
+    height: 380px;
+    overflow-y: auto;
+  }
+  .warning-table-header {
+    background: rgba(44, 96, 162, 0.2);
+    display: flex;
+    padding: 12px 0;
+  }
+  .warning-table-column {
+    padding: 12px 0;
+    background: rgba(44, 96, 162, 0.05);
+    display: flex;
+    &:nth-child(2n) {
+      background: rgba(44, 96, 162, 0.1);
+    }
+  }
+  .warning-table-run-time {
+    width: 40%;
+  }
+  .warning-table-device,
+  .warning-table-info {
+    width: 20%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+  .warning-table-status {
+    width: 20%;
+  }
+}
 </style>
\ No newline at end of file

src/components/tower/deviceDialog2.vue

@@ -9,7 +9,7 @@
     <div>
       <div class="title-label">
         <img src="@/assets/tower/arrow.png" alt="" />
-        {{ deviceData.device_sn }} /
+        {{ deviceData.device_no }} /
         <span :class="[deviceData.is_online == 1 ? 'online' : '']">{{
           deviceData.is_online_text
         }}</span>
@@ -40,10 +40,7 @@
             <div class="status-value">{{ deviceData.wind_speed }}</div>
             <div class="status-text">风速/m/s</div>
           </div>
-          <div class="status-window">
-            <div class="status-value">{{ deviceData.wind_speed_rate }}</div>
-            <div class="status-text">风速百分比/%</div>
-          </div>
+
           <div class="status-window">
             <div
               class="status-value"
@@ -55,6 +52,10 @@
             </div>
             <div class="status-text">数据更新</div>
           </div>
+          <div class="status-window" style="opacity: 0">
+            <div class="status-value">{{ deviceData.wind_speed_rate }}</div>
+            <div class="status-text">风速百分比/%</div>
+          </div>
         </div>
         <div id="video-container" v-if="deviceData.is_camera == 1"></div>
         <div id="video-container-img" v-else>