大屏

imcs-ui/src/api/runManageCenter/taskMgr.js

@@ -132,6 +132,10 @@ const apiList = {
       method: 'POST',
       url: `/authority/task/chfTwoDatas`
     },
+  chfTwoDatasProductAndMes: {
+    method: 'POST',
+    url: `/authority/task/chfTwoDatasProductAndMes`
+  },
 }
 
 export default {
@@ -344,4 +348,10 @@ export default {
       data
     })
   },
+  chfTwoDatasProductAndMes (data) {
+    return axiosApi({
+      ...apiList.chfTwoDatasProductAndMes,
+      data
+    })
+  },
 }

imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/machine.vue

@@ -60,9 +60,9 @@ export default {
       },
     },
     isOnline: {
-      type: Boolean,
+      type: String,
       default: () => {
-        return false;
+        return '0';
       }
     },
 

imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/main-item.vue

@@ -7,24 +7,24 @@
       :tableData="machineData.chfTwoDatas"
       class="item-2"
     />
-      <Progress
-       title="当前加工订单进度"
-       :tableData="machineData.chfTwoDatas"
-       :point="machineData.chfTwoDatas[0]?machineData.chfTwoDatas[0].point:0"
-       class="item-3"
+         <Progress
+          title="当前加工订单进度"
+          :tableData="machineData.chfTwoDatas"
+          :point="machineData.chfTwoDatas[0]?machineData.chfTwoDatas[0].point:0"
+          class="item-3"
+        />
+     <Order
+       title="待加工订单"
+       :column="columnNow"
+       :tableData="machineData.chfTwoDatasList"
+       class="item-4"
+     />
+     <Order
+       title="维保倒计时"
+       :column="columnTime"
+       :tableData="machineData.repairList"
+       class="item-5"
      />
-    <Order
-      title="待加工订单"
-      :column="columnNow"
-      :tableData="machineData.chfTwoDatasList"
-      class="item-4"
-    />
-    <Order
-      title="维保倒计时"
-      :column="columnTime"
-      :tableData="machineData.repairList"
-      class="item-5"
-    />
   </div>
 </template>
 <script>

imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/metric-component.vue

@@ -21,10 +21,10 @@
             padding-bottom: 5%;
           "
         >
-          周生产指标
+          月度生产指标
         </div>
         <div style="font-size: 3vh">
-          4800件
+          30件
         </div>
       </div>
     </div>
@@ -46,10 +46,10 @@
             padding-bottom: 5%;
           "
         >
-          项目进度
+          年度目标
         </div>
         <div style="margin-bottom: 2vh; font-size: 3vh">
-          4800件
+          300件
         </div>
       </div>
     </div>

imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/production-condition.vue

@@ -9,23 +9,48 @@
     <div style="font-size: 1.5vh;">
       <div style="display: flex;margin: 5% 5% 0;justify-content: space-around;">
         <div style="width: 50%;width: 60%;">
-          在库待加工件数
+          年度产量
         </div>
         <div style="font-size: 2vh;width: 40%;">
-          328
+          {{machines.yearCount}}
         </div>
       </div>
       <div style="display: flex;justify-content: space-around;margin: 5%">
         <div style="width: 60%;">
-          在库已加工件数
+          月度产量
         </div>
         <div style="font-size: 2vh;width: 40%;">
-          328
+          {{machines.monthCount}}
         </div>
       </div>
     </div>
   </div>
 </template>
+<script>
+import taskMgrApi from "@/api/runManageCenter/taskMgr";
+
+export default {
+
+  data() {
+    return {
+      machines: {}
+    };
+  },
+  async created() {
+    await this.fetchMachineData(); // 初始化时获取数据
+  },
+  methods: {
+    async fetchMachineData() {
+      taskMgrApi.chfTwoDatasProductAndMes().then(response => {
+        const res = response.data;
+        if (res.isSuccess) {
+          this.machines = response.data.data;
+        }
+      });
+    },
+  }
+}
+</script>
 <style scoped>
 .production-condition {
   height: 50%;

imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/sidebar.vue

@@ -18,12 +18,22 @@
 import Metric from './metric-component.vue';
 import productionCondition from './production-condition.vue'
 import warningInformation from './warning-information.vue'
+import taskMgrApi from "@/api/runManageCenter/taskMgr";
 export default {
 components: {
   Metric,
   productionCondition,
   warningInformation
-}
+},
+  data() {
+    return {
+      machines: {}
+    };
+  },
+  async created() {
+  },
+  methods: {
+  }
 }
 </script>
 <style lang="scss" scoped>