Browse Source

险峰大屏改动

dengrui 1 month ago
parent
commit
cfe00b8f7e

+ 8 - 0
src/api/bigScreen/index.ts

@@ -112,3 +112,11 @@ export function getOnlineInfo() {
     method: "get",
   });
 }
+
+//3D工位状态
+export function getOnline3DInfo() {
+  return request({
+    url: "/api/v1/process/census/station/state",
+    method: "post",
+  });
+}

+ 10 - 7
src/views/report/statistics/screens/line3D/index.vue

@@ -13,19 +13,19 @@
             <div class="left-header">
               <div class="num-item">
                 <div class="item-title">总数</div>
-                <div class="item-num">20</div>
+                <div class="item-num">{{ infoObj.total }}</div>
               </div>
               <div class="num-item">
                 <div class="item-title">在线</div>
-                <div class="item-num">12</div>
+                <div class="item-num">{{ infoObj.online }}</div>
               </div>
               <div class="num-item">
                 <div class="item-title">离线</div>
-                <div class="item-num">2</div>
+                <div class="item-num">{{ infoObj.offline }}</div>
               </div>
               <div class="num-item">
                 <div class="item-title">故障</div>
-                <div class="item-num">0</div>
+                <div class="item-num">{{ infoObj.fault }}</div>
               </div>
             </div>
             <div class="divider"></div>
@@ -44,7 +44,7 @@
                     <div class="leftItem textComent itembg">
                       {{ item.stationName }}
                     </div>
-                    <div class="rightItem itembg">{{ item.dayRate }}</div>
+                    <div class="rightItem itembg">{{ item.state }}</div>
                   </div>
                 </div>
               </el-scrollbar>
@@ -147,6 +147,7 @@ import {
   getDeviceList,
   getMaterialRate,
   getTodayError,
+  getOnline3DInfo,
 } from "@/api/bigScreen";
 import Middle3D from "./middle3D.vue";
 const aotuStatus = ref(true);
@@ -167,9 +168,11 @@ const returnView = () => {
 };
 
 const deviceArray = ref([]);
+const infoObj = ref({});
 const getRateArray = async () => {
-  const { data } = await getTaskRate();
-  taskRateArray.value = data;
+  const { data } = await getOnline3DInfo();
+  infoObj.value = data;
+  taskRateArray.value = data.stationState;
   nextTick(() => {
     ShowScrollRef1.value.setActive();
   });

+ 1 - 1
src/views/report/statistics/screens/line3D/middle3D.vue

@@ -286,7 +286,7 @@ const startFnc = ref(null);
 const downFnc = ref(null);
 defineExpose({ startFnc, downFnc });
 onMounted(() => {
-  getInfoArray();
+  // getInfoArray();
   const { start, down } = init3D();
   startFnc.value = () => {
     start();