Merge remote-tracking branch 'origin/xf_dev' into xf_dev

src/api/bigScreen/index.ts

@@ -91,10 +91,11 @@ export function getTaskRate() {
   });
 }
 //获取设备列表
-export function getDeviceList() {
+export function getDeviceList(data: any) {
   return request({
     url: "/api/v1/process/census/device/list",
     method: "post",
+    data,
   });
 }
 //今日报故

src/views/report/statistics/screens/line3D/index.vue

@@ -69,7 +69,7 @@
         </div>
         <div class="right block">
           <div class="block-header right-block">
-            <div class="text">自动化设备状态</div>
+            <div class="text">设备状态</div>
             <div class="english">auto-equipment status</div>
           </div>
           <div class="block-body">
@@ -87,7 +87,7 @@
                   >
                     <div class="img">
                       <el-image
-                        :src="`/images/${getRandomLetter()}.png`"
+                        :src="`/images/${item.deviceType}.png`"
                         class="img"
                       />
                       <div
@@ -140,6 +140,14 @@
 
 <script setup>
 import CommonHeaderB from "@/views/report/statistics/screens/common-headerB.vue";
+import {
+  getFaultCount,
+  getTaskCount,
+  getTaskRate,
+  getDeviceList,
+  getMaterialRate,
+  getTodayError,
+} from "@/api/bigScreen";
 import Middle3D from "./middle3D.vue";
 const aotuStatus = ref(true);
 const ShowScrollRef1 = ref(null);
@@ -158,287 +166,34 @@ const returnView = () => {
   modelRef.value.downFnc();
 };
 
-const deviceArray = ref([
-  {
-    deviceName: "测试设备",
-    ip: "11.22.108.4",
-    id: "12313213",
-    state: "离线",
-    stationName: "",
-    totalRate: "27%",
-    utilizationRate: "48%",
-  },
-  {
-    deviceName: "测试设备",
-    ip: "11.22.108.4",
-    id: "12313213",
-    state: "离线",
-    stationName: "",
-    totalRate: "28%",
-    utilizationRate: "12%",
-  },
-  {
-    deviceName: "测试设备",
-    ip: "11.22.108.4",
-    id: "12313213",
-    state: "离线",
-    stationName: "",
-    totalRate: "55%",
-    utilizationRate: "99%",
-  },
-  {
-    deviceName: "测试设备",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "离线",
-    stationName: "",
-    totalRate: "28%",
-    utilizationRate: "48%",
-  },
-  {
-    deviceName: "测试设备",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "离线",
-    stationName: "",
-    totalRate: "16%",
-    utilizationRate: "8%",
-  },
-  {
-    deviceName: "测试设备",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "在线",
-    stationName: "",
-    totalRate: "59%",
-    utilizationRate: "40%",
-  },
-  {
-    deviceName: "测试设备23",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "离线",
-    stationName: "",
-    totalRate: "90%",
-    utilizationRate: "45%",
-  },
-  {
-    deviceName: "测试设备22",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "在线",
-    stationName: "生产准备工位-4",
-    totalRate: "47%",
-    utilizationRate: "82%",
-  },
-  {
-    deviceName: "测试设备21",
-    ip: "http://10.88.20.155",
-    state: "离线",
-    stationName: "生产准备工位-4",
-    totalRate: "8%",
-    utilizationRate: "100%",
-  },
-  {
-    deviceName: "测试设备",
-    ip: "192.168.2.2",
-    state: "离线",
-    stationName: "生产准备工位18",
-    totalRate: "93%",
-    utilizationRate: "73%",
-  },
-  {
-    deviceName: "测试设备",
-    ip: "192.168.2.2",
-    state: "离线",
-    stationName: "生产准备工位18",
-    totalRate: "78%",
-    utilizationRate: "69%",
-  },
-  {
-    deviceName: "智能监控器",
-    ip: "http://10.88.20.153",
-    state: "离线",
-    stationName: "生产准备工位-2",
-    totalRate: "71%",
-    utilizationRate: "33%",
-  },
-  {
-    deviceName: "智能监控器",
-    ip: "http://10.88.20.154",
-    state: "离线",
-    stationName: "生产准备工位-3",
-    totalRate: "46%",
-    utilizationRate: "18%",
-  },
-  {
-    deviceName: "温湿度监控器",
-    ip: "http://10.88.20.153",
-    state: "在线",
-    stationName: "生产准备工位-2",
-    totalRate: "39%",
-    utilizationRate: "50%",
-  },
-  {
-    deviceName: "智能监控器",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "在线",
-    stationName: "整机装配工位-3",
-    totalRate: "61%",
-    utilizationRate: "81%",
-  },
-  {
-    deviceName: "智能监控器",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "在线",
-    stationName: "返修工位-4",
-    totalRate: "50%",
-    utilizationRate: "63%",
-  },
-  {
-    deviceName: "智能监控器",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "在线",
-    stationName: "整机装配工位-1",
-    totalRate: "95%",
-    utilizationRate: "89%",
-  },
-  {
-    deviceName: "智能监控器",
-    ip: "11.22.108.4",
-    id: "123133",
-    state: "离线",
-    stationName: "返修工位-2",
-    totalRate: "56%",
-    utilizationRate: "82%",
-  },
-]);
+const deviceArray = ref([]);
+const getRateArray = async () => {
+  const { data } = await getTaskRate();
+  taskRateArray.value = data;
+  nextTick(() => {
+    ShowScrollRef1.value.setActive();
+  });
+};
+const getDevice = async () => {
+  const { data } = await getDeviceList({
+    deviceTypes: ["CCJQR", "DDLSD", "DYJXB", "JDJKQ", "WKDLT", "WSDJKQ"],
+  });
+  deviceArray.value = data;
+  nextTick(() => {
+    ShowScrollRef2.value.setActive();
+  });
+};
 const getRandomLetter = () => {
   const letters = ["a", "b", "c", "d"];
   const randomIndex = Math.floor(Math.random() * letters.length);
   return letters[randomIndex];
 };
-const taskRateArray = ref([
-  {
-    stationName: "测试工位-1",
-    dayRate: "正常",
-  },
-  {
-    stationName: "测试工位-2",
-    dayRate: "正常",
-  },
-  {
-    stationName: "测试工位-3",
-    dayRate: "正常",
-  },
-  {
-    stationName: "测试工位-4",
-    dayRate: "正常",
-  },
-  {
-    stationName: "流转工位-1",
-    dayRate: "正常",
-  },
-  {
-    stationName: "流转工位-2",
-    dayRate: "正常",
-  },
-  {
-    stationName: "流转工位-3",
-    dayRate: "正常",
-  },
-  {
-    stationName: "流转工位-4",
-    dayRate: "正常",
-  },
-  {
-    stationName: "焊接工位-1",
-    dayRate: "正常",
-  },
-  {
-    stationName: "检验工位-1",
-    dayRate: "正常",
-  },
-  {
-    stationName: "检验工位-2",
-    dayRate: "正常",
-  },
-  {
-    stationName: "检验工位-3",
-    dayRate: "正常",
-  },
-  {
-    stationName: "检验工位-4",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-1",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-2",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-3",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-4",
-    dayRate: "正常",
-  },
-  {
-    stationName: "检验工位-4",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-1",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-2",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-3",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-4",
-    dayRate: "正常",
-  },
-  {
-    stationName: "检验工位-4",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-1",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-2",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-3",
-    dayRate: "正常",
-  },
-  {
-    stationName: "装配工位-4",
-    dayRate: "正常",
-  },
-]);
-setTimeout(() => {
-  nextTick(() => {
-    ShowScrollRef1.value.setActive();
-    ShowScrollRef2.value.setActive();
-  });
-}, 3000);
+const taskRateArray = ref([]);
+
 onMounted(() => {
   modelRef.value.startFnc();
+  getDevice();
+  getRateArray();
 });
 </script>
 

src/views/report/statistics/screens/line3D/middle3D.vue

@@ -43,7 +43,7 @@ const init3D = () => {
     }, 0);
     internval.value = setInterval(() => {
       animateCamera();
-    }, 30000);
+    }, 60000);
   };
   //停止巡航
   const down = () => {
@@ -80,7 +80,7 @@ const init3D = () => {
         lable: "x",
         value: -cameraXVal.value,
       },
-      time: 10,
+      time: 20,
     },
     {
       reset: {
@@ -95,7 +95,7 @@ const init3D = () => {
         lable: "z",
         value: -cameraZVal.value,
       },
-      time: 5,
+      time: 10,
     },
     {
       reset: {
@@ -110,7 +110,7 @@ const init3D = () => {
         lable: "x",
         value: cameraXVal.value,
       },
-      time: 10,
+      time: 20,
     },
     {
       reset: {
@@ -125,7 +125,7 @@ const init3D = () => {
         lable: "z",
         value: cameraZVal.value,
       },
-      time: 5,
+      time: 10,
     },
   ];
   //灯光