公共安全右侧 房屋外立面

src/ajax/axios.ts

@@ -11,7 +11,7 @@ Axios.interceptors.request.use(
   (config) => {
     // 添加token
     config.headers.Authorization =
-      'bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiMSIsImVuYWJsZSI6dHJ1ZSwic2NvcGUiOlsicmVhZCIsIndyaXRlIiwidHJ1c3QiXSwiZXhwIjoxNjE4MzA5MjIzLCJqdGkiOiJmODhkY2FhMy1iNGIyLTQ3OGUtYjhmMC1kZTQ5ZWU5NWUxYjciLCJjbGllbnRfaWQiOiJzc28iLCJ0aW1lc3RhbXAiOjE2MTgzMDIwMjM4NzR9.XRQSEkUuLSh8QmqGkXxFs_rL4jUuVKrYBuWa7E2DK2rYROvAe4ROJnyQAw8yKbTnZVWLwcKjPUqgVVr_OCW0MeY00pq8YaphxZTAlDdcQ88aJ_04l1F29w55n4lWZqIzveAQxOw6-U_0vTCHGzgBKHfUlbAMxG2WR54b1BDL32hqNGPjZcs7VoFZGi6sfiAYWKu8v_KeOe13tE5BelRYBxNklWYfG1npU8tKM6O3K1hANFpDmZRVSN70PQox0oiZHwJR_61RUsFPCbh-4qoI2H3fyiQMdrz7zsxakcAb2GGr0GJGoNpSMpg-qkydmIkdV3O_lFzHt4CMY78TZPg2lg'
+      'bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiMSIsImVuYWJsZSI6dHJ1ZSwic2NvcGUiOlsicmVhZCIsIndyaXRlIiwidHJ1c3QiXSwiZXhwIjoxNjE4MzE4NjQ2LCJqdGkiOiJhNGRkNTI3YS0zMTdhLTQ4NDEtOTdhZi1jM2NjMDFhN2M0MjMiLCJjbGllbnRfaWQiOiJzc28iLCJ0aW1lc3RhbXAiOjE2MTgzMTE0NDYzMTd9.NZjcj47wdocLAbLpPQWuDlq0NEwzmumJExAU8RGlYhsHV6Cw_9hKQ6yJsZTaDOD_Gp5Zw5YAxMZuh7IFcLBXKFPop-i1NNsLKAethNUOyy6PylQmmlvWhc88ykBf7Q6x63BI5yQ6zsh0_dcc-dKdeoDpIw84d9y4DuuwFVjfqrS2mU4W2qeCgHg-fuz6HikZxoMBTu2Uknx7RQls2104uoN7H0Q7O9IRv5PgbDyTK65vHMgoD3DpfcuB77ud5fBXmZ8vMATJXN6oq5Ho3f-c8kaqoOMBed6wPTG9oTMlziSU6my8u-9icMC_u9OoJKgcPNMa8Liq4rTIjsPizkptNA'
     return config
   },
   (error) => {

src/store/actions.ts

@@ -217,9 +217,8 @@ export default {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_OUTHOUSEWALL })
     ).data
-    // console.log(content)
-    commit('SET_PUBLICSAFE_OUTHOUSEWALL_2019', content[0])
-    commit('SET_PUBLICSAFE_OUTHOUSEWALL_2020', content[1])
+    console.log(content)
+    commit('SET_PUBLICSAFE_OUTHOUSEWALL', content)
   },
   // 公共服务 - 重点关注楼宇
   async GET_PUBLICSAFE_BUILDINGS({

src/store/index.ts

@@ -30,6 +30,7 @@ export interface GlobalStateProps {
   pubulicSafeBuildings: unknown[]
   pubulicSafePieData: unknown[]
   pubulicSafeNewFindNum: { [key: string]: number }
+  pubulicSafeOutHouseWall: unknown[]
 }
 export default createStore<GlobalStateProps>({
   state,

src/store/mutations.ts

@@ -85,6 +85,13 @@ export default {
   ): void {
     state.pubulicSafeSOSMaterail = data
   },
+  SET_PUBLICSAFE_OUTHOUSEWALL(
+    // 公共安全-房屋外立面
+    state: GlobalStateProps,
+    data: unknown[]
+  ): void {
+    state.pubulicSafeOutHouseWall = data
+  },
   SET_PUBLICSAFE_OUTHOUSEWALL_2019(
     // 公共安全-房屋外立面
     state: GlobalStateProps,

src/store/state.ts

@@ -27,4 +27,5 @@ export default {
   pubulicSafeBuildings: [],
   pubulicSafePieData: [],
   pubulicSafeNewFindNum: {},
+  pubulicSafeOutHouseWall: [],
 } as GlobalStateProps

src/view/right/public-safety.vue

@@ -26,6 +26,7 @@
             <a-select
               :value="year"
               dropdown-class-name="view-selector-drop-down"
+              @select="changeYear"
             >
               <a-select-option
                 v-for="option in yearOptions"
@@ -67,7 +68,7 @@
             </div>
           </div>
           <div class="bottomBox">
-            <SubTitle @clicktit="clickSecTitle">
+            <SubTitle @clicktit="searchModal = true">
               重点关注楼宇
               <template #secTitle> 查看清单 </template>
             </SubTitle>
@@ -130,6 +131,8 @@ export default defineComponent({
   components: { Police, Population, House, Company, SubTitle, Brief, Summary },
 
   setup() {
+    const showChart = computed(() => store.state.curTheme === 'safety')
+
     store.dispatch('GET_PUBLICSAFE_SOS_MATERIAL')
     store.dispatch('GET_PUBLICSAFE_OUTHOUSEWALL')
     store.dispatch('GET_PUBLICSAFE_BUILDINGS')
@@ -138,18 +141,29 @@ export default defineComponent({
     const searchModal = ref(false)
     const SOSMaterail = computed(() => store.state.pubulicSafeSOSMaterail)
     const pieData = computed(() => store.state.pubulicSafePieData)
-    const outHouseWall2019 = computed(
-      () => store.state.pubulicSafeOutHouseWall2019
-    )
-    const outHouseWall2020 = computed(
-      () => store.state.pubulicSafeOutHouseWall2020
-    )
     const buildings = computed(() => store.state.pubulicSafeBuildings)
+    const outHouseWall = computed(() => store.state.pubulicSafeOutHouseWall)
 
-    const showChart = computed(() => store.state.curTheme === 'safety')
+    const year = ref('2020') //年份
+    const yearOptions = ref(['2020', '2019']) //年份option
+
+    const houseSum = ref([
+      { name: '检查楼数', value: 0 },
+      { name: '隐患点数', value: 0 },
+      { name: '危险点数', value: 0 },
+    ])
+    // { name: '检查楼数', value: outHouseWall.value.checkNum },
+    // { name: '隐患点数', value: outHouseWall.value.hiddenPoint },
+    // { name: '危险点数', value: outHouseWall.value.dangerPoint },
 
-    const year = '2020'
-    const yearOptions = ref(['2020', '2019'])
+    //切换年份
+    const changeYear = (value: string) => {
+      year.value = value
+      console.log(outHouseWall.value)
+      // houseSum.value = [
+      // { name: '检查楼数', value: outHouseWall.value.checkNum },
+      // ]
+    }
 
     const list = computed(() => {
       return [
@@ -175,13 +189,7 @@ export default defineComponent({
         },
       ]
     })
-    const houseSum = computed(() => {
-      return [
-        { name: '检查楼数', value: outHouseWall2019.value.checkNum },
-        { name: '隐患点数', value: outHouseWall2019.value.hiddenPoint },
-        { name: '危险点数', value: outHouseWall2019.value.dangerPoint },
-      ]
-    })
+
     const population = ref([
       { name: '楼宇名称', value: 4, danger: 1 },
       { name: '楼宇名称', value: 4, danger: 1 },
@@ -190,7 +198,6 @@ export default defineComponent({
       { name: '楼宇名称', value: 4, danger: 1 },
       { name: '楼宇名称', value: 4, danger: 1 },
     ])
-
     const pieData1 = computed(() => {
       return {
         dimensions: [
@@ -199,20 +206,20 @@ export default defineComponent({
         ],
         source: [
           {
-            name: '外立面附加设施危险点',
-            value: outHouseWall2019.value.outerWallFacilityDangerPoint,
-          },
-          {
-            name: '外立面附加设施隐患点',
-            value: outHouseWall2019.value.outerWallFacilityHiddenPoint,
-          },
-          {
-            name: '外墙面层隐患点',
-            value: outHouseWall2019.value.outerWallHiddenPoint,
-          },
-          {
-            name: '外墙面层危险点',
-            value: outHouseWall2019.value.outerWallDangerPoint,
+            //   name: '外立面附加设施危险点',
+            //   value: outHouseWall.value.outerWallFacilityDangerPoint,
+            // },
+            // {
+            //   name: '外立面附加设施隐患点',
+            //   value: outHouseWall.value.outerWallFacilityHiddenPoint,
+            // },
+            // {
+            //   name: '外墙面层隐患点',
+            //   value: outHouseWall.value.outerWallHiddenPoint,
+            // },
+            // {
+            //   name: '外墙面层危险点',
+            //   value: outHouseWall.value.outerWallDangerPoint,
           },
         ],
       }
@@ -247,10 +254,7 @@ export default defineComponent({
         },
       ],
     })
-    function clickSecTitle() {
-      // 点击查看清单按钮 弹框展示全部重点关注楼宇清单列表
-      searchModal.value = true
-    }
+
     return {
       list,
       houseSum,
@@ -260,13 +264,15 @@ export default defineComponent({
       pieData2,
       pieData1,
       showChart,
+      changeYear,
       year,
       yearOptions,
       SOSMaterail,
-      outHouseWall2019,
-      outHouseWall2020,
+      // outHouseWall2019,
+      // outHouseWall2020,
       buildings,
-      clickSecTitle,
+      // clickSecTitle,
+      outHouseWall,
       pieData,
       // handleChangeYear,
     }