From 36f484d0286df350596c2dcf686ddb5ba0d0a330 Mon Sep 17 00:00:00 2001 From: zk Date: Wed, 27 Dec 2023 18:00:39 +0800 Subject: [PATCH] update --- src/assets/images/info-modal.png | Bin 0 -> 9619 bytes src/assets/less/amap-item.less | 104 ++++++++++-------- src/assets/mapUtils/map.ts | 24 ++++ src/components/chinaMap/chinaMap.vue | 2 +- src/components/item-d/pieCharts.ts | 21 +++- .../components/basicTable/BasicTable.vue | 1 + .../secondMap/components/footerDialog.vue | 17 ++- .../components/userInfoModal/motion.vue | 46 +------- .../components/userInfoModal/publicTitle.vue | 16 ++- .../components/userInfoModal/temperature.vue | 5 +- .../secondaryScreen/secondMap/secondMap.vue | 49 ++++++--- .../secondMap/secondMapHooks.ts | 76 +++++++++---- src/views/sys/login.vue | 6 + 13 files changed, 231 insertions(+), 136 deletions(-) create mode 100644 src/assets/images/info-modal.png diff --git a/src/assets/images/info-modal.png b/src/assets/images/info-modal.png new file mode 100644 index 0000000000000000000000000000000000000000..2be6ce46d0c1b81f9034e2b7ef8e48f7a6aaab4e GIT binary patch literal 9619 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 SaUxe)QD~~`sg tr.ant-table-row:hover > td, .ant-table-tbody > tr > td.ant-table-cell-row-hover) { diff --git a/src/components/secondaryScreen/secondMap/components/footerDialog.vue b/src/components/secondaryScreen/secondMap/components/footerDialog.vue index fe1ff16..074186b 100644 --- a/src/components/secondaryScreen/secondMap/components/footerDialog.vue +++ b/src/components/secondaryScreen/secondMap/components/footerDialog.vue @@ -1,15 +1,21 @@ - + \ No newline at end of file diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue index 091108b..b7345a5 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue @@ -1,4 +1,5 @@ -
{{ getDateFormat(dateInfo) }}
+
{{ getDateFormat(dateInfo) }}
@@ -284,4 +292,4 @@ box-shadow: none; } } - + \ No newline at end of file diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue index d98000a..4c511b9 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue @@ -139,6 +139,9 @@ { type: 'value', name: '温度', + nameTextStyle: { + color: '#fff', + }, axisLabel: { color: '#fff', }, @@ -205,4 +208,4 @@ initEchart('0'); }); - + \ No newline at end of file diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue index 103dfc8..f717896 100644 --- a/src/components/secondaryScreen/secondMap/secondMap.vue +++ b/src/components/secondaryScreen/secondMap/secondMap.vue @@ -9,7 +9,6 @@
-
0) { const newArr = result.map((item) => ({ ...item, type: '6' })); mapList.value = newArr; - let orgCode = newArr[0].orgCode?.substring(0, 6); - getFooterTable(orgCode); - setIsShow(true); - Map.createOverlay( newArr, { @@ -104,14 +100,20 @@
`; }, }, - (val) => { - getFooterTable(val.orgCode?.substring(0, 6)); - setIsShow(true); + async (val) => { + let params = { + orgCodeLeaf: val.orgCode, + orgCode: null, + }; + const { code, result } = await footerApi(params); + if (code == 200) { + Map.createInfoModal({ option: val, content: infoContent(result) }); + setIsShow(true); + } } ); } else { Map.removeOverlayGroup(); - setIsShow(false); } } catch {} } @@ -246,4 +248,25 @@ } } } + + :deep(.watch-modal) { + width: 300px; + height: 190px; + display: flex; + flex-direction: column; + justify-content: center; + padding-left: 10px; + + .modal-row { + font-size: 16px; + line-height: 34px; + color: #fff; + + .label { + display: inline-flex; + justify-content: flex-end; + width: 140px; + } + } + } \ No newline at end of file diff --git a/src/components/secondaryScreen/secondMap/secondMapHooks.ts b/src/components/secondaryScreen/secondMap/secondMapHooks.ts index e17b130..a4886b2 100644 --- a/src/components/secondaryScreen/secondMap/secondMapHooks.ts +++ b/src/components/secondaryScreen/secondMap/secondMapHooks.ts @@ -80,12 +80,6 @@ export function useFooterTable() { key: 'userCount', extData: {}, }, - // { - // name: '入库设备数量', - // value: '', - // key: 'deviceNum', - // extData: {}, - // }, { name: '佩戴手表人数', value: '', @@ -104,12 +98,6 @@ export function useFooterTable() { key: 'thirtyDayNum', extData: {}, }, - { - name: '近一年活跃人数', - value: '', - key: 'yearDayNum', - extData: {}, - }, ]); function setFooterList(res: any) { @@ -148,6 +136,18 @@ export function useAlarmDetail() { value: '', key: 'orgName2', }, + { + name: '位置', + value: '', + key: '', + customRender: (record) => { + if (record?.lat) { + return `${record.lat},${record.lon}`; + } else { + return '未知位置'; + } + }, + }, ]); const detailRight = ref([ { @@ -175,10 +175,18 @@ export function useAlarmDetail() { function setDetail(res) { if (res) { detailLeft.value.forEach((item) => { - item.value = res[item.key]; + if (item.customRender) { + item.value = res; + } else { + item.value = res[item.key]; + } }); detailRight.value.forEach((item) => { - item.value = res[item.key]; + if (item.customRender) { + item.value = res; + } else { + item.value = res[item.key]; + } }); } } @@ -238,7 +246,7 @@ export function useTree() { export const columns = [ { - title: '员工名称', + title: '员工姓名', dataIndex: 'realName', align: 'center', key: 'realName', @@ -248,18 +256,21 @@ export const columns = [ dataIndex: 'orgName', align: 'center', key: 'orgName', + ellipsis: true, }, { title: '部门名称', dataIndex: 'orgName1', align: 'center', key: 'orgName1', + ellipsis: true, }, { title: '工具编码', dataIndex: 'watchNo', align: 'center', key: 'watchNo', + ellipsis: true, }, { title: '心率（次/分）', @@ -314,14 +325,41 @@ export const columns = [ ]; export function useChangeTable() { - const refresh = ref(true) + const refresh = ref(true); function setRefresh() { - refresh.value = !refresh.value + refresh.value = !refresh.value; } return { refresh, - setRefresh - } + setRefresh, + }; +} + +export function infoContent(res) { + return ` +
+
+ 部门名称： + ${res?.orgName} +
+
+ 部门人数： + ${res?.userCount} +
+
+ 佩戴手表人数： + ${res?.allotDeviceNum} +
+
+ 近一周活跃人数： + ${res?.sevenDayNum} +
+
+ 近一月人数： + ${res?.thirtyDayNum} +
+
+ `; } \ No newline at end of file diff --git a/src/views/sys/login.vue b/src/views/sys/login.vue index ef2762d..4d88d18 100644 --- a/src/views/sys/login.vue +++ b/src/views/sys/login.vue @@ -99,6 +99,8 @@ import { t } from '/@/hooks/locales/useLocales.ts'; import { encipher } from '/@/utils/jsencrypt'; import { useRouter } from 'vue-router'; + import { getAuthCache } from '/@/utils/auth.ts'; + import { TOKEN_KEY } from '/@/enum/cacheEnum.ts'; const router = useRouter(); // console.log(t('login')); @@ -203,6 +205,10 @@ onMounted(() => { //加载验证码 handleChangeCheckCode(); + let token = getAuthCache(TOKEN_KEY); + if (token) { + router.push({ path: '/home' }); + } });