From 814cad17d825834f24f94d7b8c32cd79900dd43a Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Tue, 9 Sep 2025 14:56:05 +0800 Subject: [PATCH 1/6] 2.2.0 --- env/.env.development | 3 +-- manifest.config.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/env/.env.development b/env/.env.development index f246eb6..a95d8f3 100644 --- a/env/.env.development +++ b/env/.env.development @@ -8,8 +8,7 @@ VITE_SHOW_SOURCEMAP = true #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot' -VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' diff --git a/manifest.config.ts b/manifest.config.ts index 4af61d1..c8adea4 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -18,7 +18,7 @@ export default defineManifestConfig({ appid: VITE_UNI_APPID, description: '', versionName: '2.2.0', - versionCode: '20250903', + versionCode: '20250909', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ From aa9da6a821ea86416aabd19a1e711c5eb6e1f085 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Tue, 9 Sep 2025 14:56:40 +0800 Subject: [PATCH 2/6] 2.2.0 --- src/pages/login/login.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 272449f..192171f 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -137,12 +137,12 @@ }) } else { /*开发环境 */ - params.captcha = 'app'; + // params.captcha = 'app'; /*生产环境 */ - // params = { - // username: Base64.encode(encodeURIComponent(userName.value)), - // password: Base64.encode(encodeURIComponent(password.value)), - // }; + params = { + username: Base64.encode(encodeURIComponent(userName.value)), + password: Base64.encode(encodeURIComponent(password.value)), + }; } login(params) } From 74c0d48277525940da86d0b7385b52ef2736c64f Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Wed, 17 Sep 2025 14:55:44 +0800 Subject: [PATCH 3/6] 1.ofice --- src/api/devicecontrol/officedevice.ts | 9 +++++++ .../device-control/office/Personaldevices.vue | 27 ++++--------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/api/devicecontrol/officedevice.ts b/src/api/devicecontrol/officedevice.ts index a2ed01b..14d6c50 100644 --- a/src/api/devicecontrol/officedevice.ts +++ b/src/api/devicecontrol/officedevice.ts @@ -10,6 +10,15 @@ export function gethomelist(config : object) { // 获取房间信息 }) } + +export function gethomelistforApp(config : object) { // 获取房间信息 + return http({ + url: '/RoomOperation/RoomOperation/gethomelistforApp', + method: 'GET', + data: config + }) +} + export function testcontiont(config : object) { // 获取房间信息 return http({ url: mqtturl + '/mqttSubclient/mqttSubclient/testgetcontint', diff --git a/src/pages-home/device-control/office/Personaldevices.vue b/src/pages-home/device-control/office/Personaldevices.vue index 48b2747..520c629 100644 --- a/src/pages-home/device-control/office/Personaldevices.vue +++ b/src/pages-home/device-control/office/Personaldevices.vue @@ -13,30 +13,11 @@ {{ room.ssbmname }} + + - @@ -48,6 +29,7 @@ } from 'vue' import { gethomelist, + gethomelistforApp, getMqttPushClient, selectfjkzbmforfjid, createdSwitch, @@ -90,7 +72,8 @@ //获取房间信息 const getofficehomelist = async () => { - await gethomelist().then((res) => { + //20250811,张祥瑞,修改查询接口 + await gethomelistforApp().then((res) => { if (res.success) { homelist.value = res.result.map((item, index) => ({ ...item, From f56b003766c304310ba39b52a46501b2f81b24bd Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Mon, 22 Sep 2025 09:43:26 +0800 Subject: [PATCH 4/6] 1 --- env/.env.development | 4 ++-- src/manifest.json | 2 +- src/pages/login/login.vue | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/env/.env.development b/env/.env.development index a95d8f3..fc1bdf6 100644 --- a/env/.env.development +++ b/env/.env.development @@ -8,9 +8,9 @@ VITE_SHOW_SOURCEMAP = true #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' -VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot' +#VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' +VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' diff --git a/src/manifest.json b/src/manifest.json index c83b07e..962c0ae 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "appid": "__UNI__9F097F0", "description": "", "versionName": "2.2.0", - "versionCode": "20250903", + "versionCode": "20250909", "transformPx": false, "app-plus": { "usingComponents": true, diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 192171f..272449f 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -137,12 +137,12 @@ }) } else { /*开发环境 */ - // params.captcha = 'app'; + params.captcha = 'app'; /*生产环境 */ - params = { - username: Base64.encode(encodeURIComponent(userName.value)), - password: Base64.encode(encodeURIComponent(password.value)), - }; + // params = { + // username: Base64.encode(encodeURIComponent(userName.value)), + // password: Base64.encode(encodeURIComponent(password.value)), + // }; } login(params) } From ab9669637bdcd2141332160f96d7282f0d494d8d Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Mon, 22 Sep 2025 16:28:44 +0800 Subject: [PATCH 5/6] 1 --- env/.env.development | 1 - 1 file changed, 1 deletion(-) diff --git a/env/.env.development b/env/.env.development index 514145c..6474fde 100644 --- a/env/.env.development +++ b/env/.env.development @@ -9,7 +9,6 @@ VITE_SHOW_SOURCEMAP = true VITE_WEBAPP = '' #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://10.75.166.6/test' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' From 4ba99e3990691cdbb423eac0e31f65b4fe98f55a Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Tue, 23 Sep 2025 16:47:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AF=B7=E5=81=87=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=8A=B3=E8=B5=84=E5=91=98=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env.development | 3 +-- src/api/system/user.ts | 2 +- src/pages-humanResource/absence/add.vue | 20 +++++++------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/env/.env.development b/env/.env.development index 6474fde..7414cee 100644 --- a/env/.env.development +++ b/env/.env.development @@ -7,8 +7,7 @@ VITE_SHOW_SOURCEMAP = true # 是否启用读取配置文件 min #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' -#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' -VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.166.174:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://10.75.166.6/test' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 7bbc605..71d830e 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -29,7 +29,7 @@ export function editUserApi(config : object) { /*根据部门Cod和角色Id查询用户信息*/ export function queryUserByOrgRoleApi(config : object) { return http({ - url: '/cxcChangesInPersonnel/cxcChangesInPersonnel/queryByDepCodRoleId', + url: '/sys/user/queryByDepCodRoleId', method: 'GET', data: config }) diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue index 5753e67..0dcbbda 100644 --- a/src/pages-humanResource/absence/add.vue +++ b/src/pages-humanResource/absence/add.vue @@ -335,17 +335,13 @@ roleId: '1554379432313397250', orgCode: code }).then(res => { - if (res.result.length > 0) { - model.hr = res.result[0].username - } - if (!code) { - hrData.value = res.result.map(item => { - return { - label: item.realname, - value: item.username - } - }) - } + model.hr = res.result.user.username + hrData.value = res.result.list.map(item => { + return { + label: item.realname, + value: item.username + } + }) }) } @@ -364,8 +360,6 @@ getZwmcAndExa() /*获取工作单位*/ queryDepName() - /*获取劳资员*/ - getHrList() /*获取*/ queryHisDate() });