store优化

src/store/actions.ts

 import { ajax, api } from '@/ajax'
-import { Dispatch, Commit } from 'vuex'
+import { Dispatch, Commit } from './index'
 import dayjs from 'dayjs'
 import yi2 from '@/assets/images/yi2.png'
 import xue from '@/assets/images/xue.png'
@@ -12,10 +12,16 @@ import xing from '@/assets/images/xing.png'
 import smStar from '@/assets/images/star-sm.png'
 import star from '@/assets/images/star.png'
 
+interface Method {
+  commit: Commit
+  dispatch: Dispatch
+}
+
 const today = dayjs().format('YYYY-MM-DD')
 
 export default {
-  initData({ dispatch }: { dispatch: Dispatch }): void {
+  initData({ dispatch }: Method): void {
+    /** 初始化数据 */
     dispatch('getPropertySummary')
     dispatch('GET_PUBLICSAFE_COMMANDSYSTEM')
     dispatch('GET_PUBLICSAFE_STREETPOWER')
@@ -62,8 +68,9 @@ export default {
     dispatch('getEcologyPhoto')
     dispatch('getElevCount')
   },
+
   // 物业三架马车数据 （缺交叉任职数）
-  async getPropertySummary({ commit }: { commit: Commit }): Promise<void> {
+  async getPropertySummary({ commit }: Method): Promise<void> {
     const {
       GET_COMMITTEE: url1,
       GET_INDUSTRY_AUTHORITY: url2,
@@ -78,7 +85,7 @@ export default {
   },
 
   // 公共服务 - 门岗值守 - 社会物业和直管公房数据
-  async GET_PUBLICSAFE_NEWFIND({ commit }: { commit: Commit }): Promise<void> {
+  async GET_PUBLICSAFE_NEWFIND({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_NEWFIND })
     ).data
@@ -109,11 +116,7 @@ export default {
   },
 
   // 公共服务 - 门岗值守 - 社会物业和直管公房数据
-  async GET_PUBLICSAFE_RIGHT_GATE({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_RIGHT_GATE({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_RIGHT_GATE })
     ).data
@@ -166,11 +169,7 @@ export default {
   },
 
   // 公共安全 - 门岗值守 - 平安地图
-  async GET_PUBLICSAFE_RIGHT_SAFEMAP({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_RIGHT_SAFEMAP({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_PUBLICSAFE_RIGHT_SAFEMAP,
@@ -181,11 +180,7 @@ export default {
   },
 
   // 公共服务 - 实有人口
-  async GET_PUBLICSAFE_TRUE_PEOPLE({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_TRUE_PEOPLE({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_TRUE_PEOPLE })
     ).data
@@ -193,7 +188,7 @@ export default {
   },
 
   // 公共服务 - 实有房屋
-  async GET_PUBLICSAFE_HOUSE({ commit }: { commit: Commit }): Promise<void> {
+  async GET_PUBLICSAFE_HOUSE({ commit }: Method): Promise<void> {
     const { content } = (await ajax.get({ url: api.GET_PUBLICSAFE_HOUSE })).data
     commit('SET_PUBLICSAFE_HOUSE', content)
     const obj = {
@@ -219,11 +214,7 @@ export default {
   },
 
   // 公共服务 - 非居房屋
-  async GET_PUBLICSAFE_NONRESIDENT({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_NONRESIDENT({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_NONRESIDENT })
     ).data
@@ -231,11 +222,7 @@ export default {
   },
 
   // 公共服务 - 实有单位
-  async GET_PUBLICSAFE_TRUE_COMPANY({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_TRUE_COMPANY({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_TRUE_COMPANY })
     ).data
@@ -243,11 +230,7 @@ export default {
   },
 
   // 公共服务 - 应急物资储备
-  async GET_PUBLICSAFE_SOS_MATERIAL({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_SOS_MATERIAL({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_SOS_MATERIAL })
     ).data
@@ -256,11 +239,7 @@ export default {
   },
 
   // 公共服务 - 房屋外立面
-  async GET_PUBLICSAFE_OUTHOUSEWALL({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_OUTHOUSEWALL({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_OUTHOUSEWALL })
     ).data
@@ -268,11 +247,7 @@ export default {
   },
 
   // 公共安全 - 重点关注楼宇
-  async GET_PUBLICSAFE_BUILDINGS({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_BUILDINGS({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_PUBLICSAFE_BUILDINGS,
@@ -283,7 +258,7 @@ export default {
   },
 
   // 公共服务 - 房屋外立面饼图
-  async GET_PUBLICSAFE_PIEDATA({ commit }: { commit: Commit }): Promise<void> {
+  async GET_PUBLICSAFE_PIEDATA({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_PIEDATA })
     ).data
@@ -291,11 +266,11 @@ export default {
   },
 
   /** 公共服务 - 生态 */
-  async getEcologyList({ commit }: { commit: Commit }): Promise<void> {
+  async getEcologyList({ commit }: Method): Promise<void> {
     const { content } = (await ajax.get({ url: api.GET_ECOLOGY_LIST })).data
     commit('SET_ECOLOGY_LIST', content)
   },
-  async getEcologyPoints({ commit }: { commit: Commit }): Promise<void> {
+  async getEcologyPoints({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_ECOLOGY_POINTS,
@@ -352,13 +327,13 @@ export default {
     ]
     commit('SET_ECOLOGY_POINTS', result)
   },
-  async getEcologyConvenient({ commit }: { commit: Commit }): Promise<void> {
+  async getEcologyConvenient({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_ECOLOGY_CONVENIENT })
     ).data
     commit('SET_ECOLOGY_CONVENIENT', content)
   },
-  async getEcologyPhoto({ commit }: { commit: Commit }): Promise<void> {
+  async getEcologyPhoto({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_ECOLOGY_PHOTO,
@@ -367,17 +342,13 @@ export default {
     ).data
     commit('SET_ECOLOGY_PHOTO', content)
   },
-  async getElevCount({ commit }: { commit: Commit }): Promise<void> {
+  async getElevCount({ commit }: Method): Promise<void> {
     const { content } = (await ajax.get({ url: api.GET_ELEV_COUNT })).data
     commit('SET_ELEV_COUNT', content)
   },
 
   // 左侧公共 - 指挥体系
-  async GET_PUBLICSAFE_COMMANDSYSTEM({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_COMMANDSYSTEM({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_COMMANDSYSTEM })
     ).data
@@ -385,11 +356,7 @@ export default {
   },
 
   // 左侧公共 - 网格工作站
-  async GET_PUBLICSAFE_STREETPOWER({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_PUBLICSAFE_STREETPOWER({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_STREETPOWER })
     ).data
@@ -397,13 +364,13 @@ export default {
   },
 
   // 左侧公共 - 党建
-  async GET_PUBLICSAFE_PARTY({ commit }: { commit: Commit }): Promise<void> {
+  async GET_PUBLICSAFE_PARTY({ commit }: Method): Promise<void> {
     const { content } = (await ajax.get({ url: api.GET_PUBLICSAFE_PARTY })).data
     commit('SET_PUBLICSAFE_PARTY', content)
   },
 
   // 左侧公共 - 经济
-  async GET_PUBLICSAFE_ECONOMIC({ commit }: { commit: Commit }): Promise<void> {
+  async GET_PUBLICSAFE_ECONOMIC({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_PUBLICSAFE_ECONOMIC })
     ).data
@@ -411,16 +378,13 @@ export default {
   },
 
   /** 小区屏 */
-  initCommunityData({ dispatch }: { dispatch: Dispatch }, id: string): void {
+  initCommunityData({ dispatch }: Method, id: string): void {
     dispatch('getCommunityInfo', id)
     dispatch('getIssueList', id)
     dispatch('getScoreIssue', id)
     dispatch('getCombineList', id)
   },
-  async getCommunityInfo(
-    { commit }: { commit: Commit },
-    id: string
-  ): Promise<void> {
+  async getCommunityInfo({ commit }: Method, id: string): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_COMMUNITY_INFO,
@@ -431,10 +395,7 @@ export default {
       content.find((item: any) => item.id === id)
     )
   },
-  async getIssueList(
-    { commit }: { commit: Commit },
-    id: string
-  ): Promise<void> {
+  async getIssueList({ commit }: Method, id: string): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_ISSUE_LIST,
@@ -443,10 +404,7 @@ export default {
     ).data
     commit('SET_ISSUE_DATA', content)
   },
-  async getScoreIssue(
-    { commit }: { commit: Commit },
-    id: string
-  ): Promise<void> {
+  async getScoreIssue({ commit }: Method, id: string): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_SCORE_ISSUE,
@@ -455,10 +413,7 @@ export default {
     ).data
     commit('SET_SCORE_ISSUE', content)
   },
-  async getCombineList(
-    { commit }: { commit: Commit },
-    id: string
-  ): Promise<void> {
+  async getCombineList({ commit }: Method, id: string): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_COMBINE_LIST,
@@ -469,33 +424,27 @@ export default {
   },
 
   /** 工作站 */
-  initStationData({ dispatch }: { dispatch: Dispatch }, id: string): void {
+  initStationData({ dispatch }: Method, id: string): void {
     if (!id) return
     dispatch('getStationById', id)
     dispatch('getDutySum', id)
     dispatch('getOldService', id)
     dispatch('getLifeConvenient', id)
   },
-  async getStationById(
-    { commit }: { commit: Commit },
-    id: string
-  ): Promise<void> {
+  async getStationById({ commit }: Method, id: string): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_STATION, params: { id } })
     ).data
     commit('SET_STATION', content && content[0])
   },
-  async getDutySum(
-    { commit }: { commit: Commit },
-    gridId: string
-  ): Promise<void> {
+  async getDutySum({ commit }: Method, gridId: string): Promise<void> {
     const { content } = (
       await ajax.get({ url: api.GET_DUTY_SUM, params: { gridId } })
     ).data
     commit('SET_DUTY_SUM', content)
   },
   async getDutyList(
-    { commit }: { commit: Commit },
+    { commit }: Method,
     params: { [key: string]: string }
   ): Promise<void> {
     if (!params.gridId) return
@@ -508,7 +457,7 @@ export default {
     commit('SET_DUTY_LIST', content)
   },
   async getDutyRank(
-    { commit }: { commit: Commit },
+    { commit }: Method,
     params: { [key: string]: string }
   ): Promise<void> {
     if (!params.gridId) return
@@ -521,7 +470,7 @@ export default {
     commit('SET_DUTY_RANK', content)
   },
   async getDutyEvents(
-    { commit }: { commit: Commit },
+    { commit }: Method,
     params: { [key: string]: string }
   ): Promise<void> {
     if (!params.gridId) return
@@ -534,7 +483,7 @@ export default {
     commit('SET_DUTY_EVENTS', content)
   },
   async getDutyPlaces(
-    { commit }: { commit: Commit },
+    { commit }: Method,
     params: { [key: string]: string }
   ): Promise<void> {
     if (!params.gridId) return
@@ -547,7 +496,7 @@ export default {
     commit('SET_DUTY_PLACES', content)
   },
   async getDutyRanking(
-    { commit }: { commit: Commit },
+    { commit }: Method,
     params: { [key: string]: string }
   ): Promise<void> {
     if (!params.gridId) return
@@ -559,10 +508,7 @@ export default {
     ).data
     commit('SET_DUTY_RANKING', content)
   },
-  async getOldService(
-    { commit }: { commit: Commit },
-    id: string
-  ): Promise<void> {
+  async getOldService({ commit }: Method, id: string): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_OLD_SERVICE,
@@ -573,10 +519,7 @@ export default {
     ).data
     commit('SET_OLD_SERVICE', content)
   },
-  async getLifeConvenient(
-    { commit }: { commit: Commit },
-    id: string
-  ): Promise<void> {
+  async getLifeConvenient({ commit }: Method, id: string): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_LIFE_CONVENIENT,
@@ -590,21 +533,17 @@ export default {
 
   /** 公共管理 */
   // 业务入口
-  async GET_ENTRY({ commit }: { commit: Commit }): Promise<void> {
+  async GET_ENTRY({ commit }: Method): Promise<void> {
     const { content } = (await ajax.get({ url: api.GET_ENTRY })).data
     commit('SET_ENTRY', content)
   },
 
-  async GET_YOUSUBIDA_RANK({ commit }: { commit: Commit }): Promise<void> {
+  async GET_YOUSUBIDA_RANK({ commit }: Method): Promise<void> {
     // 有诉必答 - 占比
     const { content } = (await ajax.get({ url: api.GET_YOUSUBIDA_RANK })).data
     commit('SET_YOUSUBIDA_RANK', content)
   },
-  async GET_YOUSUBIDA_CLASSIFICATION_RANK({
-    commit,
-  }: {
-    commit: Commit
-  }): Promise<void> {
+  async GET_YOUSUBIDA_CLASSIFICATION_RANK({ commit }: Method): Promise<void> {
     // 有诉必答 - 分类排行
     const { content } = (
       await ajax.get({
@@ -614,13 +553,9 @@ export default {
     commit('SET_YOUSUBIDA_CLASSIFICATION_RANK', content)
   },
   async GET_URGENTCASE(
-    {
-      commit,
-    }: {
-      commit: Commit
-    },
+    { commit }: Method,
     params: {
-      [key: string]: string
+      [key: string]: unknown
     }
   ): Promise<void> {
     // 有诉必答 - 紧急案件
@@ -633,11 +568,7 @@ export default {
     commit('SET_URGENTCASE', content)
   },
   async GET_TODAYCASE(
-    {
-      commit,
-    }: {
-      commit: Commit
-    },
+    { commit }: Method,
     params: {
       [key: string]: string
     }
@@ -652,11 +583,7 @@ export default {
     commit('SET_TODAYCASE', content)
   },
   async GET_STAGECASE(
-    {
-      commit,
-    }: {
-      commit: Commit
-    },
+    { commit }: Method,
     params: {
       [key: string]: string
     }
@@ -671,11 +598,7 @@ export default {
     commit('SET_STAGECASE', content)
   },
   async GET_WORKSTATION(
-    {
-      commit,
-    }: {
-      commit: Commit
-    },
+    { commit }: Method,
     params: {
       [key: string]: string
     }
@@ -691,13 +614,9 @@ export default {
     commit('SET_WORKSTATION_PIEDATA', content[0].statistical)
   },
   async GET_TRACKEVENT(
-    {
-      commit,
-    }: {
-      commit: Commit
-    },
+    { commit }: Method,
     params: {
-      [key: string]: string
+      [key: string]: unknown
     }
   ): Promise<void> {
     // 有求必应 - 事件跟踪
@@ -710,13 +629,9 @@ export default {
     commit('SET_TRACKEVENT', content)
   },
   async GET_CASE_CLASSIFICATION_RANK(
-    {
-      commit,
-    }: {
-      commit: Commit
-    },
+    { commit }: Method,
     params: {
-      [key: string]: string
+      [key: string]: unknown
     }
   ): Promise<void> {
     // 案件分析 - 分类排行
@@ -729,11 +644,7 @@ export default {
     commit('SET_CASE_CLASSIFICATION_RANK', content)
   },
   async GET_MOREHAPPEN_ADDR(
-    {
-      commit,
-    }: {
-      commit: Commit
-    },
+    { commit }: Method,
     params: {
       [key: string]: string
     }
@@ -749,7 +660,7 @@ export default {
   },
 
   //响应度
-  async GET_RESPONSIVITY({ commit }: { commit: Commit }): Promise<void> {
+  async GET_RESPONSIVITY({ commit }: Method): Promise<void> {
     const { content } = (
       await ajax.get({
         url: api.GET_RESPONSIVITY,

src/store/index.ts

-import { createStore } from 'vuex'
+import { createStore, CommitOptions, DispatchOptions } from 'vuex'
 import state from './state'
 import mutations from './mutations'
 import actions from './actions'
@@ -168,8 +168,46 @@ export interface GlobalStateProps {
   emergencyPoints: any[]
 }
 
-export default createStore<GlobalStateProps>({
+/** ------------------------------------- 分隔线 --------------------------------------- */
+
+type CutHead<Tuple extends unknown[]> = ((...args: Tuple) => unknown) extends (
+  first: any,
+  ...rest: infer Result
+) => unknown
+  ? Result
+  : never
+
+type MutationsType = typeof mutations
+type CommitPayload = {
+  [key in keyof MutationsType]: CutHead<Parameters<MutationsType[key]>>[0]
+}
+export interface Commit {
+  <T extends keyof CommitPayload>(
+    type: T,
+    payload?: CommitPayload[T],
+    options?: CommitOptions
+  ): void
+}
+type ActionsType = typeof actions
+type DispatchPayload = {
+  [key in keyof ActionsType]: CutHead<Parameters<ActionsType[key]>>[0]
+}
+export interface Dispatch {
+  <T extends keyof DispatchPayload>(
+    type: T,
+    payload?: DispatchPayload[T],
+    options?: DispatchOptions
+  ): Promise<any>
+}
+
+const store = createStore<GlobalStateProps>({
   state,
   mutations,
   actions,
 })
+type MyStore = Omit<typeof store, 'commit' | 'dispatch'> & {
+  commit: Commit
+  dispatch: Dispatch
+}
+
+export default store as MyStore

src/store/useStore.ts

 // import { createStore } from 'vuex'
-// import { computed } from 'vue'
+// import { computed, ComputedRef } from 'vue'
+
+// interface State {
+//   [key: string]: any
+// }
+
+// interface Payload {
+//   key: string
+//   value: ComputedRef<any>
+// }
 
 // const store = createStore({
 //   state: {},
 //   mutations: {
-//     changeState(state: any, payload: any) {
+//     changeState(state: State, payload: Payload) {
+//       console.log('change state', payload)
+
 //       state[payload.key] = payload.value
+//       console.log('store-----', store.state)
 //     },
 //   },
 // })
-// export default function useStore(key: string, value: unknown): any {
+// export default function useState<K extends keyof typeof store.state, T>(
+//   key: K,
+//   value: T
+// ): [ComputedRef<T>, (val: T) => void] {
+//   store.commit('changeState', { key, value })
+//   const setFn = (value: T) => {
 //     store.commit('changeState', { key, value })
-//   const setFn = (val: unknown) => {
-//     store.commit('changeState', { key, val })
 //   }
 //   return [computed(() => store.state[key]), setFn]
 // }
 
-// // const [count, setCount] = useStore('count', 0)
+// // const [showLoad, setLoad] = useState('SET_LOADING', true)