更新应急物资设备取值

dist/index.html

@@ -6,7 +6,7 @@
   <link rel="icon" href="./favicon.ico" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>南京东路街道</title>
-<script type="module" crossorigin src="./assets/index.eb5e3b14.js"></script>
+<script type="module" crossorigin src="./assets/index.1dbbddd5.js"></script>
   <link rel="modulepreload" href="./assets/vendor.c8b46542.js">
   <link rel="stylesheet" href="./assets/index.a271709b.css">
 </head>

src/store/index.ts

@@ -120,7 +120,7 @@ export interface GlobalStateProps {
   pubulicSafeNonResident: { [key: string]: any }
   pubulicSafeHouseStKind: { [key: string]: number }
   pubulicSafeTrueCompany: { [key: string]: number }
-  pubulicSafeSOSMaterail: { [key: string]: number }
+  pubulicSafeEmergencySupplies: { [key: string]: number }
   pubulicSafeBuildings: unknown[]
   pubulicSafePieData: unknown[]
   pubulicSafeNewFindNum: { [key: string]: number }

src/store/mutations.ts

@@ -121,7 +121,7 @@ export default {
     state: GlobalStateProps,
     data: { [key: string]: any }
   ): void {
-    state.pubulicSafeSOSMaterail = data
+    state.pubulicSafeEmergencySupplies = data
   },
   SET_PUBLICSAFE_OUTHOUSEWALL(
     // 公共安全-房屋外立面

src/store/state.ts

@@ -206,7 +206,7 @@ export default {
   pubulicSafeNonResident: {},
   pubulicSafeHouseStKind: {},
   pubulicSafeTrueCompany: {},
-  pubulicSafeSOSMaterail: {},
+  pubulicSafeEmergencySupplies: {},
   pubulicSafeBuildings: [],
   pubulicSafePieData: [],
   pubulicSafeNewFindNum: {},

src/view/right/emergency-store.vue

@@ -114,7 +114,9 @@ export default defineComponent({
   setup() {
     const showChart = computed(() => store.state.curTheme === 'safety')
     const listModal = ref(false)
-    const SOSMaterail = computed(() => store.state.pubulicSafeSOSMaterail)
+    const emergencyData = computed(
+      () => store.state.pubulicSafeEmergencySupplies
+    )
     const pieData = computed(() => store.state.pubulicSafePieData)
     const outHouseWall = computed(() => store.state.pubulicSafeOutHouseWall)
 
@@ -198,21 +200,31 @@ export default defineComponent({
     }
 
     const list = computed(() => {
+      const {
+        emergencyRescue = 0,
+        emergencySupplies = 0,
+        floodPreventionUnits = 0,
+        warmAntifreeze = 0,
+        wyEmergencyRescue = 0,
+        wyEmergencySupplies = 0,
+        wyFloodPreventionUnits = 0,
+        wyWarmAntifreeze = 0,
+      } = emergencyData.value
       return [
         {
-          value: SOSMaterail.value.floodPreventionUnits || 0,
+          value: (+floodPreventionUnits + +wyFloodPreventionUnits) || 0,
           name: '防汛防台',
         },
         {
-          value: SOSMaterail.value.warmAntifreeze || 0,
+          value: (+warmAntifreeze + +wyWarmAntifreeze) || 0,
           name: '防寒抗冻',
         },
         {
-          value: SOSMaterail.value.emergencySupplies || 0,
+          value: (+emergencySupplies + +wyEmergencySupplies) || 0,
           name: '疫情控制',
         },
         {
-          value: SOSMaterail.value.emergencyRescue || 0,
+          value: (+emergencyRescue + +wyEmergencyRescue) || 0,
           name: '应急抢险',
         },
       ]
@@ -344,7 +356,7 @@ export default defineComponent({
       changeYear,
       year,
       yearOptions,
-      SOSMaterail,
+      emergencyData,
       buildings,
       outHouseWall,
       pieData,