数据

src/pages/modules/homepage/one.vue

@@ -19,10 +19,10 @@
                             </div>
                             <div class="bg_line"></div>
                           </div>
-                          <img v-show="String(e.device_status) === '0'" src="../../../images/workshop/hlj_s_gray.png" alt="">
+                          <img v-show="String(e.status) === '0'" src="../../../images/workshop/hlj_s_gray.png" alt="">
-                          <img v-show="String(e.device_status) === '1'" src="../../../images/workshop/hlj_s_yellow.png" alt="">
+                          <img v-show="String(e.status) === '1'" src="../../../images/workshop/hlj_s_yellow.png" alt="">
-                          <img v-show="String(e.device_status) === '2'" src="../../../images/workshop/hlj_s_green.png" alt="">
+                          <img v-show="String(e.status) === '2'" src="../../../images/workshop/hlj_s_green.png" alt="">
-                          <img v-show="String(e.device_status) === '3'" src="../../../images/workshop/hlj_s_red.png" alt="">
+                          <img v-show="String(e.status) === '3'" src="../../../images/workshop/hlj_s_red.png" alt="">
                         </div>
                       </div>
                       <div v-if="MixMachineList.length > 0" class="machine_wrap hlj_wrap">
@@ -35,10 +35,10 @@
                             </div>
                             <div class="bg_line"></div>
                           </div>
-                          <img v-show="String(e.device_status) === '0'" src="../../../images/workshop/hlj_gray.png" alt="">
+                          <img v-show="String(e.status) === '0'" src="../../../images/workshop/hlj_gray.png" alt="">
-                          <img v-show="String(e.device_status) === '1'" src="../../../images/workshop/hlj_yellow.png" alt="">
+                          <img v-show="String(e.status) === '1'" src="../../../images/workshop/hlj_yellow.png" alt="">
-                          <img v-show="String(e.device_status) === '2'" src="../../../images/workshop/hlj_green.png" alt="">
+                          <img v-show="String(e.status) === '2'" src="../../../images/workshop/hlj_green.png" alt="">
-                          <img v-show="String(e.device_status) === '3'" src="../../../images/workshop/hlj_red.png" alt="">
+                          <img v-show="String(e.status) === '3'" src="../../../images/workshop/hlj_red.png" alt="">
                         </div>
                       </div>
                       <div v-if="MixBlankingList.length > 0" class="machine_wrap lz_wrap_1">
@@ -718,25 +718,45 @@ export default {
     async _workshopCondition () {
       let res = await workshopCondition()
       if (res.code === 200) {
-        this.HLDayList = [...res.result.HLDayList]
+        if (res.result.hasOwnProperty('HLDayList')) {
-        if (this.HLDayList.length) {
+          this.HLDayList = [...res.result.HLDayList]
-          this.setEchart1()
+          if (this.HLDayList.length) {
+            this.setEchart1()
+          }
         }
-        this.YZDayList = [...res.result.YZDayList]
+        if (res.result.hasOwnProperty('YZDayList')) {
-        if (this.YZDayList.length) {
+          this.YZDayList = [...res.result.YZDayList]
-          this.setEchart2()
+          if (this.YZDayList.length) {
+            this.setEchart2()
+          }
         }
-        this.CPDayList = [...res.result.CPDayList]
+        if (res.result.hasOwnProperty('CPDayList')) {
-        if (this.CPDayList.length) {
+          this.CPDayList = [...res.result.CPDayList]
-          this.setEchart3()
+          if (this.CPDayList.length) {
+            this.setEchart3()
+          }
+        }
+        if (res.result.hasOwnProperty('PressMachineList')) {
+          this.PressMachineList = [...res.result.PressMachineList]
+        }
+        if (res.result.hasOwnProperty('MixMachineList')) {
+          this.MixMachineList = [...res.result.MixMachineList]
+        }
+        if (res.result.hasOwnProperty('MixBlankingList')) {
+          this.MixBlankingList = [...res.result.MixBlankingList]
+        }
+        if (res.result.hasOwnProperty('TrappedShelfList')) {
+          this.TrappedShelfList = [...res.result.TrappedShelfList]
+        }
+        if (res.result.hasOwnProperty('StackingPositionList')) {
+          this.StackingPositionList = [...res.result.StackingPositionList]
+        }
+        if (res.result.hasOwnProperty('TrappedMaterialShelfList')) {
+          this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
+        }
+        if (res.result.hasOwnProperty('ManipulatorInfoList')) {
+          this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
         }
-        this.PressMachineList = [...res.result.PressMachineList]
-        this.MixMachineList = [...res.result.MixMachineList]
-        this.MixBlankingList = [...res.result.MixBlankingList]
-        this.TrappedShelfList = [...res.result.TrappedShelfList]
-        this.StackingPositionList = [...res.result.StackingPositionList]
-        this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
-        this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
       }
     },
     setEchart1 () {

src/pages/modules/homepage/two.vue

@@ -430,20 +430,38 @@ export default {
     async _workshopCondition () {
       let res = await workshopCondition()
       if (res.code === 200) {
-        this.DeviceConditionList = [...res.result.DeviceConditionList]
+        if (res.result.hasOwnProperty('DeviceConditionList')) {
-        this.LastMonthFailureList = [...res.result.LastMonthFailureList]
+          this.DeviceConditionList = [...res.result.DeviceConditionList]
-        this.LastTenFailureList = [...res.result.LastTenFailureList]
+          if (this.DeviceConditionList.length) {
-        this.SortAndPalletizingList = [...res.result.SortAndPalletizingList]
+            this.setEchart1()
-        this.SemiFinishedProductShelfList = [...res.result.SemiFinishedProductShelfList]
+          }
-        this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
+        }
-        this.setEchart1()
+        if (res.result.hasOwnProperty('LastMonthFailureList')) {
-        this.setEchart2()
+          this.LastMonthFailureList = [...res.result.LastMonthFailureList]
+          if (this.LastMonthFailureList.length) {
+            this.setEchart2()
+          }
+        }
+        if (res.result.hasOwnProperty('LastTenFailureList')) {
+          this.LastTenFailureList = [...res.result.LastTenFailureList]
+        }
+        if (res.result.hasOwnProperty('SortAndPalletizingList')) {
+          this.SortAndPalletizingList = [...res.result.SortAndPalletizingList]
+        }
+        if (res.result.hasOwnProperty('SemiFinishedProductShelfList')) {
+          this.SemiFinishedProductShelfList = [...res.result.SemiFinishedProductShelfList]
+        }
+        if (res.result.hasOwnProperty('ManipulatorInfoList')) {
+          this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
+        }
       }
     },
     async _sortingAndPackagingPopover () {
       let res = await sortingAndPackagingPopover()
       if (res.code === 200) {
-        this.PackagingLineList = [...res.result.PackagingLineList]
+        if (res.result.hasOwnProperty('PackagingLineList')) {
+          this.PackagingLineList = [...res.result.PackagingLineList]
+        }
       }
     },
     setEchart1 () {

src/pages/modules/sortpack/one.vue

@@ -466,17 +466,29 @@ export default {
     async _workshopCondition () {
       let res = await workshopCondition()
       if (res.code === 200) {
-        this.SortAndPalletizingList = [...res.result.SortAndPalletizingList]
+        if (res.result.hasOwnProperty('SortAndPalletizingList')) {
-        this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
+          this.SortAndPalletizingList = [...res.result.SortAndPalletizingList]
+        }
+        if (res.result.hasOwnProperty('ManipulatorInfoList')) {
+          this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
+        }
       }
     },
     async _sortingAndPackagingPopover () {
       let res = await sortingAndPackagingPopover()
       if (res.code === 200) {
-        this.SplitOrPalletizingList = [...res.result.SplitOrPalletizingList]
+        if (res.result.hasOwnProperty('SplitOrPalletizingList')) {
-        this.HalfSupportCacheList = [...res.result.HalfSupportCacheList]
+          this.SplitOrPalletizingList = [...res.result.SplitOrPalletizingList]
-        this.DevicesInfoList = res.result.DevicesInfoList
+        }
-        this.PackagingLineList = [...res.result.PackagingLineList]
+        if (res.result.hasOwnProperty('HalfSupportCacheList')) {
+          this.HalfSupportCacheList = [...res.result.HalfSupportCacheList]
+        }
+        if (res.result.hasOwnProperty('DevicesInfoList')) {
+          this.DevicesInfoList = res.result.DevicesInfoList
+        }
+        if (res.result.hasOwnProperty('PackagingLineList')) {
+          this.PackagingLineList = [...res.result.PackagingLineList]
+        }
       }
     },
     expandTooltip () {

src/pages/modules/sortpack/two.vue

@@ -185,12 +185,24 @@ export default {
     async _sortingAndPackaging () {
       let res = await sortingAndPackaging()
       if (res.code === 200) {
-        this.SortingDayList = [...res.result.SortingDayList]
+        if (res.result.hasOwnProperty('SortingDayList')) {
-        this.PackingAreaTaskList = [...res.result.PackingAreaTaskList]
+          this.SortingDayList = [...res.result.SortingDayList]
-        this.HalfSupportCacheList = [...res.result.HalfSupportCacheList]
+          if (this.SortingDayList.length) {
-        this.CPDayList = [...res.result.CPDayList]
+            this.setEchart1()
-        this.setEchart1()
+          }
-        this.setEchart2()
+        }
+        if (res.result.hasOwnProperty('PackingAreaTaskList')) {
+          this.PackingAreaTaskList = [...res.result.PackingAreaTaskList]
+        }
+        if (res.result.hasOwnProperty('HalfSupportCacheList')) {
+          this.HalfSupportCacheList = [...res.result.HalfSupportCacheList]
+        }
+        if (res.result.hasOwnProperty('CPDayList')) {
+          this.CPDayList = [...res.result.CPDayList]
+          if (this.CPDayList.length) {
+            this.setEchart2()
+          }
+        }
       }
     },
     setEchart1 () {

src/pages/modules/takeshape/one.vue

@@ -863,27 +863,45 @@ export default {
     async _workshopCondition () {
       let res = await workshopCondition()
       if (res.code === 200) {
-        this.PressMachineList = [...res.result.PressMachineList]
+        if (res.result.hasOwnProperty('PressMachineList')) {
-        this.TrappedShelfList = [...res.result.TrappedShelfList]
+          this.PressMachineList = [...res.result.PressMachineList]
-        this.StackingPositionList = [...res.result.StackingPositionList]
+        }
-        this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
+        if (res.result.hasOwnProperty('TrappedShelfList')) {
-        this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
+          this.TrappedShelfList = [...res.result.TrappedShelfList]
+        }
+        if (res.result.hasOwnProperty('StackingPositionList')) {
+          this.StackingPositionList = [...res.result.StackingPositionList]
+        }
+        if (res.result.hasOwnProperty('TrappedMaterialShelfList')) {
+          this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
+        }
+        if (res.result.hasOwnProperty('ManipulatorInfoList')) {
+          this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
+        }
       }
     },
     // 弹窗内容
     async _moldingMaterialCondition () {
       let res = await moldingMaterialCondition()
       if (res.code === 200) {
-        this.PressPopoverList = [...res.result.PressPopoverList]
+        if (res.result.hasOwnProperty('PressPopoverList')) {
-        this.ManipulatorList = [...res.result.ManipulatorList]
+          this.PressPopoverList = [...res.result.PressPopoverList]
-        this.TrayStationPopoverList = [...res.result.TrayStationPopoverList]
+        }
+        if (res.result.hasOwnProperty('ManipulatorList')) {
+          this.ManipulatorList = [...res.result.ManipulatorList]
+        }
+        if (res.result.hasOwnProperty('TrayStationPopoverList')) {
+          this.TrayStationPopoverList = [...res.result.TrayStationPopoverList]
+        }
       }
     },
     // 困料货架弹窗
     async _trappedMaterialCondition () {
       let res = await trappedMaterialCondition()
       if (res.code === 200) {
-        this.TrappedShelf40List = [...res.result.TrappedShelf40List]
+        if (res.result.hasOwnProperty('TrappedShelf40List')) {
+          this.TrappedShelf40List = [...res.result.TrappedShelf40List]
+        }
       }
     },
     expandTooltip () {

src/pages/modules/takeshape/two.vue

@@ -207,9 +207,15 @@ export default {
     async _moldingTableDate () {
       let res = await moldingTableDate()
       if (res.code === 200) {
-        this.MoldingIOStoringList = [...res.result.MoldingIOStoringList]
+        if (res.result.hasOwnProperty('MoldingIOStoringList')) {
-        this.SemiFinishedProductShelList = [...res.result.SemiFinishedProductShelList]
+          this.MoldingIOStoringList = [...res.result.MoldingIOStoringList]
-        this.MoldingDayList = [...res.result.MoldingDayList]
+        }
+        if (res.result.hasOwnProperty('SemiFinishedProductShelList')) {
+          this.SemiFinishedProductShelList = [...res.result.SemiFinishedProductShelList]
+        }
+        if (res.result.hasOwnProperty('MoldingDayList')) {
+          this.MoldingDayList = [...res.result.MoldingDayList]
+        }
       }
     },
     expandTooltip () {