Skip to content

E
east-nanjing-new
Commit 9cf4a6b7 authored by 郭铭瑶's avatar 郭铭瑶 🤘
Browse files
Options

Merge branch 'master' of http://git.omniview.pro/yaominguo/east-nanjing-new

parents c36f5a75 724d237c
Show whitespace changes
Inline Side-by-side
Showing with 303 additions and 144 deletions
package-lock.json
View file @ 9cf4a6b7
{
"name": "east-nanjing-new",
"version": "1.0.0",
"lockfileVersion": 2,
"lockfileVersion": 1,
"requires": true,
"packages": {
"": {
......@@ -5178,6 +5178,7 @@
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/@vue/compiler-sfc/download/@vue/compiler-sfc-3.0.5.tgz",
"integrity": "sha1-OuCOYCRKcvr5WYNhh0+3vbWx03w=",
"dev": true,
"requires": {
"@babel/parser": "^7.12.0",
"@babel/types": "^7.12.0",
......@@ -5201,6 +5202,7 @@
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/@vue/compiler-ssr/download/@vue/compiler-ssr-3.0.5.tgz",
"integrity": "sha1-dmGtiRoL6UhybH960eQlJTxYe4M=",
"dev": true,
"requires": {
"@vue/compiler-dom": "3.0.5",
"@vue/shared": "3.0.5"
......@@ -5503,6 +5505,7 @@
"version": "3.2.1",
"resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1606792371412&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz",
"integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
"dev": true,
"requires": {
"color-convert": "^1.9.0"
}
......@@ -5615,12 +5618,14 @@
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npm.taobao.org/big.js/download/big.js-5.2.2.tgz",
"integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg="
"integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
"dev": true
},
"bluebird": {
"version": "3.7.2",
"resolved": "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz",
"integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28="
"integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28=",
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
......@@ -5667,6 +5672,7 @@
"version": "2.4.2",
"resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
"integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
"dev": true,
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
......@@ -5677,6 +5683,7 @@
"version": "5.5.0",
"resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&sync_timestamp=1608033349725&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
"integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
"dev": true,
"requires": {
"has-flag": "^3.0.0"
}
......@@ -5763,6 +5770,7 @@
"version": "1.9.3",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz",
"integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
"dev": true,
"requires": {
"color-name": "1.1.3"
}
......@@ -5770,7 +5778,8 @@
"color-name": {
"version": "1.1.3",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz",
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
"dev": true
},
"colorette": {
"version": "1.2.1",
......@@ -5799,6 +5808,7 @@
"version": "0.16.0",
"resolved": "https://registry.npm.taobao.org/consolidate/download/consolidate-0.16.0.tgz",
"integrity": "sha1-oRhkdokw8vGUMWYKZZBmaPX73BY=",
"dev": true,
"requires": {
"bluebird": "^3.7.2"
}
......@@ -5863,7 +5873,8 @@
"cssesc": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz",
"integrity": "sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4="
"integrity": "sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=",
"dev": true
},
"csstype": {
"version": "2.6.14",
......@@ -5964,7 +5975,8 @@
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
"integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang="
"integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=",
"dev": true
},
"enquirer": {
"version": "2.3.6",
......@@ -6030,7 +6042,8 @@
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
"dev": true
},
"eslint": {
"version": "7.17.0",
......@@ -6549,6 +6562,7 @@
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/generic-names/download/generic-names-2.0.1.tgz?cache=0&sync_timestamp=1603542764418&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgeneric-names%2Fdownload%2Fgeneric-names-2.0.1.tgz",
"integrity": "sha1-+KN46tLMqno08DF7BVVIMq5BuHI=",
"dev": true,
"requires": {
"loader-utils": "^1.1.0"
}
......@@ -6637,7 +6651,8 @@
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
"has-symbols": {
"version": "1.0.1",
......@@ -6648,7 +6663,8 @@
"hash-sum": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz",
"integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo="
"integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
"dev": true
},
"highlight.js": {
"version": "10.5.0",
......@@ -6671,12 +6687,14 @@
"icss-replace-symbols": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/icss-replace-symbols/download/icss-replace-symbols-1.1.0.tgz",
"integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0="
"integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
"dev": true
},
"icss-utils": {
"version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz?cache=0&sync_timestamp=1605801267950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-4.1.1.tgz",
"integrity": "sha1-IRcLU3ie4nRHwvR91oMIFAP5pGc=",
"dev": true,
"requires": {
"postcss": "^7.0.14"
}
......@@ -6706,7 +6724,8 @@
"indexes-of": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz",
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
"inflight": {
"version": "1.0.6",
......@@ -6867,6 +6886,7 @@
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz",
"integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
......@@ -6897,6 +6917,7 @@
"version": "1.4.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.0.tgz",
"integrity": "sha1-xXm140yzSxp07cbB+za/o3HVphM=",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
......@@ -6926,7 +6947,8 @@
"lodash.camelcase": {
"version": "4.3.0",
"resolved": "https://registry.npm.taobao.org/lodash.camelcase/download/lodash.camelcase-4.3.0.tgz",
"integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
"integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
"dev": true
},
"loose-envify": {
"version": "1.4.0",
......@@ -6940,6 +6962,7 @@
"version": "5.1.1",
"resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz",
"integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=",
"dev": true,
"requires": {
"yallist": "^3.0.2"
}
......@@ -6948,6 +6971,7 @@
"version": "0.25.7",
"resolved": "https://registry.npm.taobao.org/magic-string/download/magic-string-0.25.7.tgz",
"integrity": "sha1-P0l9b9NMZpxnmNy4IfLvMfVEUFE=",
"dev": true,
"requires": {
"sourcemap-codec": "^1.4.4"
}
......@@ -6956,6 +6980,7 @@
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/merge-source-map/download/merge-source-map-1.1.0.tgz",
"integrity": "sha1-L93n5gIJOfcJBqaPLXrmheTIxkY=",
"dev": true,
"requires": {
"source-map": "^0.6.1"
}
......@@ -6988,7 +7013,8 @@
"minimist": {
"version": "1.2.5",
"resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1606706583368&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
"integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
"integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=",
"dev": true
},
"mkdirp": {
"version": "1.0.4",
......@@ -7250,6 +7276,7 @@
"version": "7.0.35",
"resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.35.tgz?cache=0&sync_timestamp=1610186282508&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.35.tgz",
"integrity": "sha1-0r4AuZj38hHYonaXQHny6SuXDiQ=",
"dev": true,
"requires": {
"chalk": "^2.4.2",
"source-map": "^0.6.1",
......@@ -7260,6 +7287,7 @@
"version": "3.2.2",
"resolved": "https://registry.npm.taobao.org/postcss-modules/download/postcss-modules-3.2.2.tgz",
"integrity": "sha1-7jkN4PnxjnYeF3jfub4maFwCxR8=",
"dev": true,
"requires": {
"generic-names": "^2.0.1",
"icss-replace-symbols": "^1.1.0",
......@@ -7276,6 +7304,7 @@
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-2.0.0.tgz",
"integrity": "sha1-gYcZoa4doyX5gyRGsBE27rSTzX4=",
"dev": true,
"requires": {
"postcss": "^7.0.5"
}
......@@ -7284,6 +7313,7 @@
"version": "3.0.3",
"resolved": "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-3.0.3.tgz?cache=0&sync_timestamp=1602587682123&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-3.0.3.tgz",
"integrity": "sha1-uxTgzHgnnVBNvcv9fgyiiZP/u7A=",
"dev": true,
"requires": {
"icss-utils": "^4.1.1",
"postcss": "^7.0.32",
......@@ -7295,6 +7325,7 @@
"version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-2.2.0.tgz",
"integrity": "sha1-OFyuATzHdD9afXYC0Qc6iequYu4=",
"dev": true,
"requires": {
"postcss": "^7.0.6",
"postcss-selector-parser": "^6.0.0"
......@@ -7304,6 +7335,7 @@
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-3.0.0.tgz",
"integrity": "sha1-W1AA1uuuKbQlUwG0o6VFdEI+fxA=",
"dev": true,
"requires": {
"icss-utils": "^4.0.0",
"postcss": "^7.0.6"
......@@ -7313,6 +7345,7 @@
"version": "6.0.4",
"resolved": "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-6.0.4.tgz?cache=0&sync_timestamp=1601045448419&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.4.tgz",
"integrity": "sha1-VgdaE4CgRgTDiwY+p3Z6Epr1wrM=",
"dev": true,
"requires": {
"cssesc": "^3.0.0",
"indexes-of": "^1.0.1",
......@@ -7323,7 +7356,8 @@
"postcss-value-parser": {
"version": "4.1.0",
"resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.1.0.tgz",
"integrity": "sha1-RD9qIM7WSBor2k+oUypuVdeJoss="
"integrity": "sha1-RD9qIM7WSBor2k+oUypuVdeJoss=",
"dev": true
},
"prelude-ls": {
"version": "1.2.1",
......@@ -7623,7 +7657,8 @@
"sourcemap-codec": {
"version": "1.4.8",
"resolved": "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz",
"integrity": "sha1-6oBL2UhXQC5pktBaOO8a41qatMQ="
"integrity": "sha1-6oBL2UhXQC5pktBaOO8a41qatMQ=",
"dev": true
},
"spdx-correct": {
"version": "3.1.1",
......@@ -7666,7 +7701,8 @@
"string-hash": {
"version": "1.1.3",
"resolved": "https://registry.npm.taobao.org/string-hash/download/string-hash-1.1.3.tgz",
"integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs="
"integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=",
"dev": true
},
"string-width": {
"version": "4.2.0",
......@@ -7769,6 +7805,7 @@
"version": "6.1.0",
"resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&sync_timestamp=1608033349725&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
"integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
"dev": true,
"requires": {
"has-flag": "^3.0.0"
}
......@@ -7900,7 +7937,8 @@
"uniq": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz",
"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
"dev": true
},
"uri-js": {
"version": "4.4.1",
......@@ -7920,7 +7958,8 @@
"util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz",
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true
},
"v8-compile-cache": {
"version": "2.2.0",
......@@ -8042,8 +8081,7 @@
"vuex": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/vuex/download/vuex-4.0.0.tgz",
"integrity": "sha1-rId6p2qcRTaMl5Rx5GG1INOObPU=",
"requires": {}
"integrity": "sha1-rId6p2qcRTaMl5Rx5GG1INOObPU="
},
"warning": {
"version": "4.0.3",
......@@ -8120,7 +8158,8 @@
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.1.tgz",
"integrity": "sha1-27fa+b/YusmrRev2ArjLrQ1dCP0="
"integrity": "sha1-27fa+b/YusmrRev2ArjLrQ1dCP0=",
"dev": true
},
"yargs": {
"version": "16.2.0",
......
src/ajax/api.ts
View file @ 9cf4a6b7
......@@ -28,6 +28,11 @@ export default {
GET_PUBLICSAFE_PIEDATA: '/service-special-nandong/inspection/getPie', // 公共安全-右侧-房屋外立面饼图
GET_PUBLICSAFE_NEWFIND: '/service-special-nandong/noAlert', // 公共安全-右侧-最新发现
// 左侧公共
GET_PUBLICSAFE_COMMANDSYSTEM: '/service-special-nandong/commandSystem', // 指挥体系
GET_PUBLICSAFE_STREETPOWER: '/service-special-nandong/streetPower', // 网格工作站(原名街道力量)
GET_PUBLICSAFE_PARTY: '/service-special-nandong/party', // 党建
GET_PUBLICSAFE_ECONOMIC: '/service-special-nandong/economic', // 经济
/** 小区屏 */
GET_COMMUNITY_INFO: '/service-special-nandong/bigscreenCommunity/statistical', // 小区档案
GET_COMMUNITY_FACILITY: '/service-special-nandong/communityRelations', // 小区设施
......
src/store/actions.ts
View file @ 9cf4a6b7
......@@ -8,6 +8,7 @@ export default {
initData({ dispatch }: { dispatch: Dispatch }): void {
dispatch('getPropertySummary')
dispatch('getCaseList')
// dispatch('GET_PUBLICSAFE_ECONOMIC')
},
// 物业三架马车数据 （缺交叉任职数）
async getPropertySummary({ commit }: { commit: Commit }): Promise<void> {
......@@ -217,7 +218,7 @@ export default {
const { content } = (
await ajax.get({ url: api.GET_PUBLICSAFE_OUTHOUSEWALL })
).data
console.log(content)
// console.log(content)
commit('SET_PUBLICSAFE_OUTHOUSEWALL', content)
},
// 公共服务 - 重点关注楼宇
......@@ -239,9 +240,47 @@ export default {
const { content } = (
await ajax.get({ url: api.GET_PUBLICSAFE_PIEDATA })
).data
console.log(content)
// console.log(content)
commit('SET_PUBLICSAFE_PIEDATA', content)
},
// 左侧公共 - 指挥体系
async GET_PUBLICSAFE_COMMANDSYSTEM({
commit,
}: {
commit: Commit
}): Promise<void> {
const { content } = (
await ajax.get({ url: api.GET_PUBLICSAFE_COMMANDSYSTEM })
).data
// console.log(content)
commit('SET_PUBLICSAFE_COMMANDSYSTEM', content)
},
// 左侧公共 - 网格工作站
async GET_PUBLICSAFE_STREETPOWER({
commit,
}: {
commit: Commit
}): Promise<void> {
const { content } = (
await ajax.get({ url: api.GET_PUBLICSAFE_STREETPOWER })
).data
// console.log(content, '网格工作站)')
commit('SET_PUBLICSAFE_STREETPOWER', content.workStation || [])
},
// 左侧公共 - 党建
async GET_PUBLICSAFE_PARTY({ commit }: { commit: Commit }): Promise<void> {
const { content } = (await ajax.get({ url: api.GET_PUBLICSAFE_PARTY })).data
// console.log(content, '党建')
commit('SET_PUBLICSAFE_PARTY', content)
},
// 左侧公共 - 经济
async GET_PUBLICSAFE_ECONOMIC({ commit }: { commit: Commit }): Promise<void> {
const { content } = (
await ajax.get({ url: api.GET_PUBLICSAFE_ECONOMIC })
).data
// console.log(content, '经济')
commit('SET_PUBLICSAFE_ECONOMIC', content)
},
/** 小区屏 */
initCommunityData({ dispatch }: { dispatch: Dispatch }, id: string): void {
......
src/store/index.ts
View file @ 9cf4a6b7
......@@ -72,6 +72,10 @@ export interface GlobalStateProps {
pubulicSafePieData: unknown[]
pubulicSafeNewFindNum: { [key: string]: number }
pubulicSafeOutHouseWall: any[]
pubulicLeftCommandSystem: { [key: string]: string }
pubulicLeftStreetPower: any[]
pubulicLeftParty: { [key: string]: number }
pubulicLeftEconomic: { [key: string]: string }
/** 小区页面 */
communityInfo: Partial<CommunityInfoProp>
......
src/store/mutations.ts
View file @ 9cf4a6b7
......@@ -122,7 +122,35 @@ export default {
): void {
state.pubulicSafeNewFindNum = data
},
SET_PUBLICSAFE_COMMANDSYSTEM(
// 左侧公共-指挥体系
state: GlobalStateProps,
data: { [key: string]: string }
): void {
state.pubulicLeftCommandSystem = data
},
SET_PUBLICSAFE_STREETPOWER(
// 左侧公共-网格工作站
state: GlobalStateProps,
data: unknown[]
): void {
state.pubulicLeftStreetPower = data
},
SET_PUBLICSAFE_PARTY(
// 左侧公共-党建
state: GlobalStateProps,
data: { [key: string]: number }
): void {
state.pubulicLeftParty = data
},
SET_PUBLICSAFE_ECONOMIC(
// 左侧公共-经济
state: GlobalStateProps,
data: { [key: string]: string }
): void {
state.pubulicLeftEconomic = data
},
/** 小区页面 */
SET_COMMUNITY_INFO(state: GlobalStateProps, data: CommunityInfoProp): void {
state.communityInfo = data
......
src/store/state.ts
View file @ 9cf4a6b7
......@@ -26,6 +26,10 @@ export default {
pubulicSafePieData: [],
pubulicSafeNewFindNum: {},
pubulicSafeOutHouseWall: [],
pubulicLeftCommandSystem: {},
pubulicLeftStreetPower: [],
pubulicLeftParty: {},
pubulicLeftEconomic: {},
communityInfo: {},
issueData: [],
combineData: { cleanList: [], securityList: [], orderlyList: [] },
......
src/view/left/command.vue
View file @ 9cf4a6b7
......@@ -34,16 +34,16 @@
<p class="doubleRow">
<span>
<span>日</span>
<span>{{ item.leader }}(城管) 、{{ item.leader1 }}(绿化)</span>
<span>{{ item.personnelDay }}</span>
</span>
<span>
<span>夜</span>
<span>{{ item.leader2 }}(警长)</span>
<span>{{ item.personnelNight }}</span>
</span>
</p>
<p class="doubleRow2">
<span>{{ item.dayTime }}</span>
<span>{{ item.nightTime }}</span>
<span>{{ item.workTimeDay }}</span>
<span>{{ item.workTimeNight }}</span>
</p>
<p>{{ item.number }}人</p>
</div>
......@@ -70,7 +70,7 @@
</template>
<script lang="ts">
import { defineComponent, ref, computed } from 'vue'
import { defineComponent, ref, computed, watch } from 'vue'
import Tabs, { TabsProp } from '../components/tabs.vue'
import SubTitle from '../components/sub-title.vue'
import Summary, { SummaryProp } from '../components/summary.vue'
......@@ -88,91 +88,118 @@ export default defineComponent({
name: 'Command',
components: { Tabs, SubTitle, Summary, Brief, Cricle },
setup() {
const leaders = ref([
// 指挥体系-领导
const leaders = computed(() => {
return [
{
img: avatar1,
type: '指挥长',
name: '袁登全',
name: commandSystem.value.zhz,
},
{
img: avatar2,
type: '副指挥长',
name: '卢军',
},
// {
// img: avatar1,
// type: '指挥长',
// name: '姓名',
// },
// {
// img: avatar2,
// type: '指挥长',
// name: '姓名',
// },
])
const members = ref([
name: commandSystem.value.fzhz,
},
]
})
// 指挥体系-人员
const members = computed(() => {
return [
{
name: '鲁涵智',
name: commandSystem.value.sqglb,
type: '社区管理办',
},
{
name: '范杲逻',
name: commandSystem.value.dzb,
type: '党政办',
},
{
name: '庞勇',
name: commandSystem.value.sqpab,
type: '社区平安办',
},
{
name: '鲁涵智',
type: '社区管理办',
name: commandSystem.value.sqzzb,
type: '社区自治办',
},
{
name: '鲁涵智',
type: '社区管理办',
name: commandSystem.value.ndpcs,
type: '南东派出所',
},
{
name: '鲁涵智',
type: '社区管理办',
name: commandSystem.value.gczas,
type: '广场治安所',
},
{
name: '鲁涵智',
type: '社区管理办',
name: commandSystem.value.scjgs,
type: '市场监管所',
},
{
name: '鲁涵智',
type: '社区管理办',
name: commandSystem.value.cgzd,
type: '城管中队',
},
])
]
})
store.dispatch('GET_PUBLICSAFE_COMMANDSYSTEM')
store.dispatch('GET_PUBLICSAFE_STREETPOWER')
store.dispatch('GET_PUBLICSAFE_PARTY')
store.dispatch('GET_PUBLICSAFE_ECONOMIC')
const commandSystem = computed(() => store.state.pubulicLeftCommandSystem)
const streetPower = computed(() => store.state.pubulicLeftStreetPower)
const party = computed(() => store.state.pubulicLeftParty)
const economic = computed(() => store.state.pubulicLeftEconomic)
const dutyTableData = ref([
{
group: '第一工作站',
leader: '长名',
leader1: '人名',
leader2: '名2',
dayTime: '8时-18时',
nightTime: '18时-8时',
number: 5,
personnelDay: '日间人',
personnelNight: '夜间人',
workTimeDay: '8时-18时',
workTimeNight: '18时-8时',
number: '5',
},
{
group: '第二工作站',
leader: '长名',
leader1: '人名',
leader2: '名2',
dayTime: '8时-18时',
nightTime: '18时-8时',
number: 5,
personnelDay: '日间人',
personnelNight: '夜间人',
workTimeDay: '8时-18时',
workTimeNight: '18时-8时',
number: '5',
},
{
group: '第三工作站',
leader: '长名',
leader1: '人名',
leader2: '名2',
dayTime: '8时-18时',
nightTime: '18时-8时',
number: 5,
personnelDay: '日间人',
personnelNight: '夜间人',
workTimeDay: '8时-18时',
workTimeNight: '18时-8时',
number: '5',
},
])
watch(
// 监听改变网格工作站的数据
[() => streetPower.value, () => dutyTableData.value],
([data, dutyData]) => {
if (data.length === 0) return
dutyData.forEach((ele: any, i: number) => {
const duty = data.find((e: any) => e.workstationName === ele.group)
if (duty) {
dutyTableData.value[i] = {
group: ele.group,
personnelDay: duty.personnelDay,
personnelNight: duty.personnelNight,
workTimeDay: duty.workTimeDay,
workTimeNight: duty.workTimeNight,
number: duty.num,
}
}
})
},
{ immediate: true }
)
const btns = ref([
{
icon: icon1,
......@@ -212,62 +239,66 @@ export default defineComponent({
name: '经济',
},
])
const partySummary = ref<SummaryProp[]>([
const partySummary = computed(() => {
return [
{
name: '全部',
value: 165,
value: party.value.partyNum || 0,
unit: '人',
},
{
name: '政府单位',
value: 20,
name: '机关党员',
value: party.value.organsParty || 0,
unit: '人',
},
{
name: '企业',
value: 45,
name: '居民区',
value: party.value.residential || 0,
unit: '人',
},
{
name: '群众',
value: 100,
name: '企业',
value: party.value.enterprise || 0,
unit: '人',
},
])
]
})
const propertySummary = computed(() => {
const { num1, num2, num3 } = store.state.propertySummary
const { wy, com, ywh, cross } = store.state.pubulicLeftParty
return [
{
name: '居委会',
value: num1 || 0,
value: com || 0,
icon: icon3,
},
{
name: '业委会',
value: num2 || 0,
value: ywh || 0,
icon: icon4,
},
{
name: '物业企业',
value: num3 || 0,
value: wy || 0,
icon: icon5,
},
{
name: '交叉任职',
value: 5,
value: cross || 0,
},
]
})
const economicList = ref([
const economicList = computed(() => {
return [
{
name: '商办空置率',
value: 88,
value: economic.value.vacancyRate.split('%')[0] || 0,
},
{
name: '综合商业体使用率',
value: 88,
value: economic.value.useRate.split('%')[0] || 0,
},
])
]
})
return {
leaders,
members,
......
src/view/right/police.vue
View file @ 9cf4a6b7
......@@ -38,6 +38,8 @@
v-model="searchModal"
width="20%"
offset="-50%"
enter="fadeInUp"
leave="fadeOutDown"
translate-y="84%"
:title="`${streetData.cmtName}2021年1季度得分`"
>
......
src/view/right/public-safety.vue
View file @ 9cf4a6b7
......@@ -100,7 +100,14 @@
</div>
</m-card>
</m-card>
<m-modal v-model="searchModal" width="50%" title="重点关注楼宇清单">
<m-modal
v-model="searchModal"
enter="fadeInRight"
leave="fadeOutRight"
offset="55%"
width="40%"
title="重点关注楼宇清单"
>
<div>
<m-table
:template="[
......@@ -175,22 +182,22 @@ export default defineComponent({
return [
{
img: Circle,
value: SOSMaterail.value.floodPreventionUnits,
value: SOSMaterail.value.floodPreventionUnits || 0,
name: '防汛防台',
},
{
img: Circle,
value: SOSMaterail.value.warmAntifreeze,
value: SOSMaterail.value.warmAntifreeze || 0,
name: '防寒抗冻',
},
{
img: Circle,
value: SOSMaterail.value.emergencySupplies,
value: SOSMaterail.value.emergencySupplies || 0,
name: '疫情控制',
},
{
img: Circle,
value: SOSMaterail.value.emergencyRescue,
value: SOSMaterail.value.emergencyRescue || 0,
name: '应急抢险',
},
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment