diff --git a/env/.env.development b/env/.env.development index 514145c..4c770e5 100644 --- a/env/.env.development +++ b/env/.env.development @@ -7,13 +7,11 @@ 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.173.194:8080/jeecg-boot' +#VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://10.75.166.6/test' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' +VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' diff --git a/src/api/devicecontrol/officedevice.ts b/src/api/devicecontrol/officedevice.ts index a2ed01b..720cadb 100644 --- a/src/api/devicecontrol/officedevice.ts +++ b/src/api/devicecontrol/officedevice.ts @@ -10,6 +10,33 @@ export function gethomelist(config : object) { // 获取房间信息 }) } + +// export function gethomelistforApp(config : object) { // 获取房间信息 +// return http({ +// url: '/RoomOperation/RoomOperation/gethomelistforApp', +// method: 'GET', +// data: config +// }) +// } + +//张祥瑞20250925修改为该方法 +export function gethomelistforApp(config : object) { // 获取房间信息 + return http({ + url: '/RoomAPP/RoomAPP/gethomelistforApp', + method: 'GET', + data: config + }) +} +//张祥瑞20250925添加方法，传参为房间表id +export function getfjkzbmforfjidApp(config : object) { // 查询开关状态 + return http({ + url: mqtturl + + "/mqttcontroller/mqttcontroller/getfjkzbmforfjid", + method: 'GET', + data: config + }) +} + export function testcontiont(config : object) { // 获取房间信息 return http({ url: mqtturl + '/mqttSubclient/mqttSubclient/testgetcontint', @@ -78,9 +105,17 @@ export function listAllRegions(config : object) { // 查询开关状态 }) } +// export function Selecthomelist(config : object) { // 查询开关状态 +// return http({ +// url: '/RoomOperation/RoomOperation/Selecthomelist', +// method: 'GET', +// data: config +// }) +// } +//张祥瑞，20250925修改为该方法 export function Selecthomelist(config : object) { // 查询开关状态 return http({ - url: '/RoomOperation/RoomOperation/Selecthomelist', + url: '/RoomAPP/RoomAPP/SelecthomelistForApp', method: 'GET', data: config }) diff --git a/src/api/production/index.ts b/src/api/production/index.ts index 2d07362..69f6b14 100644 --- a/src/api/production/index.ts +++ b/src/api/production/index.ts @@ -64,4 +64,12 @@ export function queryJldRbDataByJldID(params : object) { // 获取计量点日 method: 'GET', data: params }) +} + +export function queryGyKrDataByZc(params : object) { // 获取工艺和可燃气体实时数据 + return http({ + url: '/http://10.75.166.6:9999/Gyk/sssj/GetGyKrByZc', + method: 'GET', + data: params + }) } \ No newline at end of file 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/common/socket.ts b/src/common/socket.ts index facb619..e1ed04a 100644 --- a/src/common/socket.ts +++ b/src/common/socket.ts @@ -7,7 +7,7 @@ const baseUrl = import.meta.env.VITE_SERVER_BASEURL class socket { constructor() { - console.log(77777777777777) + // console.log(77777777777777) this.socketUrl = baseUrl this.socketStart = false this.socketType = '' @@ -50,7 +50,7 @@ class socket { }) // update-end-author:taoyan date:20220422 for: v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278 uni.onSocketOpen((res) => { - console.log("连接进来了--------53333333333323----") + // console.log("连接进来了--------53333333333323----") this.socketStart = true callback && callback() console.log('WebSocket连接已打开！') @@ -85,10 +85,10 @@ class socket { socketReceive() { const _this = this uni.onSocketMessage(function (res) { - console.log('APP:--》收到服务器内容：', res) - console.log('连接路径----：', baseUrl) + // console.log('APP:--》收到服务器内容：', res) + // console.log('连接路径----：', baseUrl) if (res.data.startsWith('CONNECTED') || res.data.startsWith('MESSAGE') || res.data.startsWith('RECEIPT')) { - console.log('放行----------：', res) + // console.log('放行----------：', res) // 放行 STOMP 协议消息，交给 socketTask.onMessage 处理 by 闵 return; } diff --git a/src/pages-home/device-control/office/ALLleader.vue b/src/pages-home/device-control/office/ALLleader.vue index c7da6a2..40d3af6 100644 --- a/src/pages-home/device-control/office/ALLleader.vue +++ b/src/pages-home/device-control/office/ALLleader.vue @@ -39,7 +39,7 @@ - + - @@ -48,11 +29,13 @@ } from 'vue' import { gethomelist, + gethomelistforApp, getMqttPushClient, selectfjkzbmforfjid, createdSwitch, listAllRegions, - Selecthomelist + Selecthomelist, + getfjkzbmforfjidApp } from '@/api/devicecontrol/officedevice'; // import useWebSocketService from '@/api/devicecontrol/webSocketService' @@ -90,18 +73,33 @@ //获取房间信息 const getofficehomelist = async () => { - await gethomelist().then((res) => { + //20250811,张祥瑞,修改查询接口 + await gethomelistforApp().then((res) => { if (res.success) { homelist.value = res.result.map((item, index) => ({ ...item, - homezt: 0, // 添加homezt字段，默认为0 + // homezt: 0, // 添加homezt字段，默认为0 })); } }).catch((err) => { console.log(err); }); filteredFloors.value = groupByFloor(homelist) - getAllswitchByids(); + // getAllswitchByids(); + //获取完房间信息然后订阅 + getfjkzbmforfjid(); + } + //订阅房间信息 + const getfjkzbmforfjid = () => { + for (const item of filteredFloors.value) { + getfjkzbmforfjidApp({fjbid:item.id}).then((res) => { + console.log("订阅成功--------------",res) + }).catch((err) => { + console.log("订阅失败："+item.fjh+"。失败信息："+err); + }); + } + + } // 数据分组处理 @@ -246,7 +244,7 @@ if (res.success) { selectBydata.value = res.result; filteredFloors.value = groupByFloor(selectBydata) - getAllswitchByids() + // getAllswitchByids() } } //----------------树状展示end----------- diff --git a/src/pages-home/device-control/office/officehomedevice.vue b/src/pages-home/device-control/office/officehomedevice.vue index cfdab58..6d7ac64 100644 --- a/src/pages-home/device-control/office/officehomedevice.vue +++ b/src/pages-home/device-control/office/officehomedevice.vue @@ -62,15 +62,15 @@ 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() }); diff --git a/src/pages-production/shishishuju/gycsSssj.vue b/src/pages-production/shishishuju/gycsSssj.vue index 02409e3..b482c97 100644 --- a/src/pages-production/shishishuju/gycsSssj.vue +++ b/src/pages-production/shishishuju/gycsSssj.vue @@ -1,8 +1,336 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '站场工艺参数实时数据', + }, + } + + + + + + {{caijiText}} + 选择站场 - - \ No newline at end of file diff --git a/src/pages-production/shishishuju/index.vue b/src/pages-production/shishishuju/index.vue index 7e99fd4..46b7090 100644 --- a/src/pages-production/shishishuju/index.vue +++ b/src/pages-production/shishishuju/index.vue @@ -14,18 +14,31 @@ - 天然气实时数据汇总计算结果，用标签显示出各类天然气的实时数据，需要工业库后台进行计算 + 天然气计量实时数据 - - 各条管线的天然气实时数据汇总计算结果，用标签显示出各类天然气的实时数据，需要工业库后台进行计算 + + 各站场工艺参数实时数据 + + 各站场可燃气体报警仪实时数据 + + + + 各站场压缩机运行参数实时数据 + + + @@ -40,6 +53,30 @@ } function gotoGdSssj() { + uni.navigateTo({ + url: '/pages-production/shishishuju/gycsSssj' + }) + } + + function gotoGycsSssj() { + uni.navigateTo({ + url: '/pages-production/shishishuju/gycsSssj' + }) + } + + function gotoKrqtbjSssj() { + uni.navigateTo({ + url: '/pages-production/shishishuju/krqtSssj' + }) + } + + function gotoYsjSssj() { + uni.navigateTo({ + url: '/pages-production/shishishuju/ysjSssj' + }) + } + + function gotoScSssj() { uni.navigateTo({ url: '/pages-production/shishishuju/trqSssj' }) diff --git a/src/pages-production/shishishuju/krqtSssj.vue b/src/pages-production/shishishuju/krqtSssj.vue new file mode 100644 index 0000000..89c036a --- /dev/null +++ b/src/pages-production/shishishuju/krqtSssj.vue @@ -0,0 +1,336 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '可燃气体浓度实时数据', + }, + } + + + + + \ No newline at end of file diff --git a/src/pages-production/shishishuju/ysjSssj.vue b/src/pages-production/shishishuju/ysjSssj.vue index 02409e3..3063bff 100644 --- a/src/pages-production/shishishuju/ysjSssj.vue +++ b/src/pages-production/shishishuju/ysjSssj.vue @@ -1,8 +1,465 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '压缩机实时数据', + }, + } + + + + + + {{caijiText}} + 选择站场 - - \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 88075ba..18cb4a2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -643,7 +643,12 @@ }, { "path": "shishishuju/gycsSssj", - "type": "page" + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "站场工艺参数实时数据" + } }, { "path": "shishishuju/index", @@ -654,6 +659,15 @@ "navigationBarTitleText": "实时数据 " } }, + { + "path": "shishishuju/krqtSssj", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "可燃气体浓度实时数据" + } + }, { "path": "shishishuju/nyxhSssj", "type": "page" @@ -669,7 +683,12 @@ }, { "path": "shishishuju/ysjSssj", - "type": "page" + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "压缩机实时数据" + } }, { "path": "shishishuju/chart/lssjChart", diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 046b680..52ca5fa 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -79,6 +79,7 @@ interface NavigateToOptions { "/pages-production/shishishuju/aqbjSssj" | "/pages-production/shishishuju/gycsSssj" | "/pages-production/shishishuju/index" | + "/pages-production/shishishuju/krqtSssj" | "/pages-production/shishishuju/nyxhSssj" | "/pages-production/shishishuju/trqSssj" | "/pages-production/shishishuju/ysjSssj" |