From cc3bbaf3776295b55c7a30b578a012d064db939a Mon Sep 17 00:00:00 2001 From: TiaStars Date: Fri, 22 Mar 2024 10:02:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=95=E7=A4=BA=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BA=94=E4=B8=AA=E4=B8=AD=E9=98=9F=E7=9A=84=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=9C=A8=E7=BA=BF=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +- src/api/bigScreenApi/index.js | 14 + .../{矩形 987@2x.png => bgtongyongTwo.png} | Bin src/assets/images/organizationChart.png | Bin 0 -> 3053 bytes src/assets/images/organizationChartTwo.png | Bin 0 -> 389 bytes src/assets/images/soundWave.png | Bin 0 -> 197 bytes .../bigScreen/components/mapLeftContent.vue | 542 ++++++++++++++---- src/views/bigScreen/map/index.vue | 119 +++- src/views/components/mapLeftNumber/index.vue | 68 ++- src/views/components/title/index.vue | 45 +- 10 files changed, 637 insertions(+), 157 deletions(-) rename src/assets/images/{矩形 987@2x.png => bgtongyongTwo.png} (100%) create mode 100644 src/assets/images/organizationChart.png create mode 100644 src/assets/images/organizationChartTwo.png create mode 100644 src/assets/images/soundWave.png diff --git a/.env.development b/.env.development index bc58c3c..03270b0 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ # @Author: 张涛 # @Date: 2023-11-09 18:29:41 # @LastEditors: JC9527 - # @LastEditTime: 2024-03-07 20:51:13 + # @LastEditTime: 2024-03-21 17:55:10 # @FilePath: \JiangningUrbanManagePc\.env.development ### # 页面标题 @@ -14,10 +14,10 @@ ENV = 'development' # 若依管理系统/开发环境 # /dev-api # VUE_APP_BASE_API = 'http://39.101.188.84:9037' -VUE_APP_BASE_API = 'https://t-jn-bjh-admin-server.jsszkd.com' +# VUE_APP_BASE_API = 'https://t-jn-bjh-admin-server.jsszkd.com' VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com' VUE_APP_BASE_API2 = 'https://t-jn-development-manager-server.jsszkd.com/api/webapp' -# VUE_APP_BASE_API = 'http://192.168.0.110:9037' +VUE_APP_BASE_API = 'http://192.168.0.112:9037' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/bigScreenApi/index.js b/src/api/bigScreenApi/index.js index 8dfc226..0903a1a 100644 --- a/src/api/bigScreenApi/index.js +++ b/src/api/bigScreenApi/index.js @@ -226,4 +226,18 @@ export function getDept(id){ url: '/jn/department/getDept/' + id, method: 'get' }) +} +// 展开的部门加人员数结构 +export function getUserCount(){ + return request({ + url:"/jn/department/getUserCount", + method:"get", + }) +} +// 根据名字,手机号模糊查询人员 +export function getImeiUserOnline(user){ + return request({ + url:"/jn/department/getImeiUserOnline/" + user, + method:"get", + }) } \ No newline at end of file diff --git a/src/assets/images/矩形 987@2x.png b/src/assets/images/bgtongyongTwo.png similarity index 100% rename from src/assets/images/矩形 987@2x.png rename to src/assets/images/bgtongyongTwo.png diff --git a/src/assets/images/organizationChart.png b/src/assets/images/organizationChart.png new file mode 100644 index 0000000000000000000000000000000000000000..5abd7acfb7822defb8c535dc9cc4e3efc09ce760 GIT binary patch literal 3053 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/soundWave.png b/src/assets/images/soundWave.png new file mode 100644 index 0000000000000000000000000000000000000000..51b7130edb0059744f52e65d77859d37e8a17806 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^`0({ArbCx zrv-8yP~dUCJUdtYcG;%N%{>p#ud#O(xjC)LUNz&_iluDwPxumwUy7!!yj12fgJ;iV zhMf#M&Kn1L&)@RZ!K~n0Mu?<9W54i;Rqde8EUx{Z%^+TKUmDOU44$rjF6*2Ung9p7MQs28 literal 0 HcmV?d00001 diff --git a/src/views/bigScreen/components/mapLeftContent.vue b/src/views/bigScreen/components/mapLeftContent.vue index 5f668fb..9fcd425 100644 --- a/src/views/bigScreen/components/mapLeftContent.vue +++ b/src/views/bigScreen/components/mapLeftContent.vue @@ -4,101 +4,176 @@ * @Author: JC9527 * @Date: 2023-08-15 09:44:13 * @LastEditors: JC9527 - * @LastEditTime: 2024-03-08 08:56:50 + * @LastEditTime: 2024-03-22 10:00:19 --> diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue index aa02d2a..8d81de2 100644 --- a/src/views/bigScreen/map/index.vue +++ b/src/views/bigScreen/map/index.vue @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2024-01-09 23:08:15 * @LastEditors: JC9527 - * @LastEditTime: 2024-03-14 16:12:31 + * @LastEditTime: 2024-03-20 13:15:38 -->