diff --git a/manifest.config.ts b/manifest.config.ts index 9630047..ff0af2f 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -18,7 +18,7 @@ export default defineManifestConfig({ appid: VITE_UNI_APPID, description: '', versionName: '2.0.0', - versionCode: '20250603', + versionCode: '20250605', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ diff --git a/src/components/PageLayout/PageLayout.vue b/src/components/PageLayout/PageLayout.vue index d11684c..c2a5947 100644 --- a/src/components/PageLayout/PageLayout.vue +++ b/src/components/PageLayout/PageLayout.vue @@ -106,6 +106,7 @@ // 只有在页面中才默认返回，弹层中不返回 if (props.type === 'page') { const pages = getCurrentPages() + console.log(router) if (props.backRouteName || props.backRoutePath) { const prevPage = pages[pages.length - 2] if (prevPage) { diff --git a/src/manifest.json b/src/manifest.json index 43a36a8..5fdabbc 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "appid": "__UNI__9F097F0", "description": "", "versionName": "2.0.0", - "versionCode": "20250603", + "versionCode": "20250605", "transformPx": false, "app-plus": { "usingComponents": true, diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue index 0916cea..2405a10 100644 --- a/src/pages-humanResource/absence/add.vue +++ b/src/pages-humanResource/absence/add.vue @@ -202,7 +202,7 @@ const startMutilProcess = (id) => { startMutilProcessApi({ - flowCode: "dev_cxc_qxj_new", + flowCode: "dev_cxc_qxj", id, formUrl: "modules/qxj/modules/CxcQxjBpmModel", formUrlMobile: "leaveApplication" diff --git a/src/pages-humanResource/personnel/ageStatistics.vue b/src/pages-humanResource/personnel/ageStatistics.vue index 3300704..152da76 100644 --- a/src/pages-humanResource/personnel/ageStatistics.vue +++ b/src/pages-humanResource/personnel/ageStatistics.vue @@ -112,7 +112,7 @@ function detail(record) { uni.navigateTo({ - url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record)) + url: '/pages-humanResource/personnel/detail?data=' + encodeURIComponent(JSON.stringify(record)) }); } // 计算年龄 diff --git a/src/pages-operate/file/detail.vue b/src/pages-operate/file/detail.vue index f5c78f6..310104f 100644 --- a/src/pages-operate/file/detail.vue +++ b/src/pages-operate/file/detail.vue @@ -11,12 +11,14 @@ - + {{dataSource.zdmc}} - + {{dataSource.jdwj}} diff --git a/src/pages-process/components/historicalTasks.vue b/src/pages-process/components/historicalTasks.vue index 7a9b6f6..70b7cb0 100644 --- a/src/pages-process/components/historicalTasks.vue +++ b/src/pages-process/components/historicalTasks.vue @@ -93,6 +93,7 @@ pageSize }).then((res) => { if (res.success) { + console.log('---',res) list.value = [...list.value,...res.result.records]; } loading = false diff --git a/src/pages.json b/src/pages.json index e44fad2..198c56b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -177,7 +177,12 @@ }, { "path": "pages/production/ribaoshuju/rbsjLsxq", - "type": "page" + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "历史数据" + } }, { "path": "pages/production/ribaoshuju/trqRbsj", diff --git a/src/pages/onlinePreview/detail.vue b/src/pages/onlinePreview/detail.vue index 4d85970..9c780cc 100644 --- a/src/pages/onlinePreview/detail.vue +++ b/src/pages/onlinePreview/detail.vue @@ -14,7 +14,7 @@ - + diff --git a/src/pages/onlinePreview/onlinePreview.vue b/src/pages/onlinePreview/onlinePreview.vue index 3dffb35..25590ac 100644 --- a/src/pages/onlinePreview/onlinePreview.vue +++ b/src/pages/onlinePreview/onlinePreview.vue @@ -18,9 +18,6 @@ onLoad } from '@dcloudio/uni-app'; import base64 from '@/utils/code'; - import { - getEnvBaseUrl - } from '@/utils/index' const baseUrl = 'https://10.75.166.6/jeecg-boot/sys/common/static/'; var fileUrl = ""; diff --git a/src/pages/production/index.vue b/src/pages/production/index.vue index adcac4f..0181ff7 100644 --- a/src/pages/production/index.vue +++ b/src/pages/production/index.vue @@ -12,14 +12,14 @@ - + - + @@ -35,7 +35,7 @@ - + @@ -98,6 +98,10 @@ window.removeEventListener('resize', calculateScrollViewHeight); }); + onHide(()=>{ //切换首页后，将生产切换为日本数据以清楚定时 by闵 + current.value = 0; + }) + const calculateScrollViewHeight = () => { // 获取屏幕的总高度 const screenHeight = uni.getSystemInfoSync().windowHeight; diff --git a/src/pages/production/ribaoshuju/rbsjLsxq.vue b/src/pages/production/ribaoshuju/rbsjLsxq.vue index 95b7741..8520956 100644 --- a/src/pages/production/ribaoshuju/rbsjLsxq.vue +++ b/src/pages/production/ribaoshuju/rbsjLsxq.vue @@ -1,5 +1,14 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '历史数据', + }, + } + @@ -91,6 +65,11 @@ max: 0, avg: 0 }); + const screenWidth = ref(0) + const calculateTableHeight = () => { + const systemInfo = uni.getSystemInfoSync(); + screenWidth.value = systemInfo.screenWidth; + } const getJinriShengchansj = (tempDateRange) => { // console.log(tempDateRange); // 添加日期有效性检查 @@ -232,6 +211,11 @@ onMounted(() => { // nextTick(); // getJinriShengchansj(dateRange.value); + calculateTableHeight(); + // 监听屏幕旋转变化 + uni.onWindowResize(() => { + calculateTableHeight(); + }); }); onLoad((options) => { @@ -253,70 +237,6 @@ \ No newline at end of file + \ No newline at end of file diff --git a/src/pages/production/shishishuju/trqSssj.vue b/src/pages/production/shishishuju/trqSssj.vue index 64b915d..b97dc1f 100644 --- a/src/pages/production/shishishuju/trqSssj.vue +++ b/src/pages/production/shishishuju/trqSssj.vue @@ -8,7 +8,7 @@ - + @@ -114,18 +114,7 @@ }); uni.onSocketMessage(function(res) { console.log('收到服务器内容：' + res.data); - // 语音播放 start - const innerAudioContext = uni.createInnerAudioContext(); - innerAudioContext.autoplay = true; - innerAudioContext.src = 'https://wzs1.oss-cn-beijing.aliyuncs.com/music.mp3'; - innerAudioContext.onPlay(() => { - console.log('开始播放'); - }); - innerAudioContext.onError(res => { - console.log(res.errMsg); - console.log(res.errCode); - }); - //语音播放 end + }); // 这里仅是事件监听【如果socket关闭了会执行】 uni.onSocketClose(function(res) { @@ -141,15 +130,22 @@ console.log(2, e, data.value); stationID.value = e stationName.value = data.value.title + getScData(); //获取生产数据 + + } + + const getScData= ()=>{ uni.request({ url: jlByzc.value + '?zhanc=' + stationID.value + '&jldLx=0', method: 'GET', success: (res) => { + console.log(res) jlData.value = JSON.parse(res.data.result).JlData; } }) - } + + const websock = ref(null); const timer2 = ref(null); // 封装心跳函数 @@ -157,7 +153,10 @@ timer2.value = setInterval(() => { if (websock.value && websock.value.readyState === 1) { // 如果连接正常，发送心跳消息 - connectSocketInit() + // connectSocketInit() + } + if(stationID.value){ + getScData(); } }, 1000); }; @@ -176,9 +175,13 @@ websocketheart() }) - - - + + onUnmounted(()=>{ //页面销毁删除定时 + // 销毁定时器 + console.log(22222) + clearInterval(timer2.value); + }) + // 数字格式化 const formatNumber = (num) => { let temp = 0;