From e204aaa91717aae2125132719a2f3553d78a9886 Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Wed, 4 Jun 2025 11:19:19 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AE=9E=E7=8E=B0=E7=A7=92=E7=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=202.=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=8D=95=E4=B8=AA=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88=E6=97=B6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=80=E7=BA=A7=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=B7=B3=E8=BF=87=E4=B8=AD=E9=97=B4=E4=BB=B6=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env.development | 2 +- manifest.config.ts | 4 +- src/components/PageLayout/PageLayout.vue | 1 + src/manifest.json | 4 +- src/pages/login/login.vue | 4 +- src/pages/onlinePreview/detail.vue | 18 ++++++++- src/pages/production/index.vue | 9 ++++- src/pages/production/shishishuju/trqSssj.vue | 39 +++++++++++--------- 8 files changed, 53 insertions(+), 28 deletions(-) diff --git a/env/.env.development b/env/.env.development index 096ebec..e550644 100644 --- a/env/.env.development +++ b/env/.env.development @@ -5,4 +5,4 @@ VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' \ No newline at end of file +#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file diff --git a/manifest.config.ts b/manifest.config.ts index 1ade4c0..a2fb3c4 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -17,8 +17,8 @@ export default defineManifestConfig({ name: VITE_APP_TITLE, appid: VITE_UNI_APPID, description: '', - versionName: '2.0.0', - versionCode: '20250529', + versionName: '1.1.22', + versionCode: '20250530', 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 68ea237..628535c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name": "数智产销", "appid": "__UNI__9F097F0", "description": "", - "versionName": "2.0.0", - "versionCode": "20250529", + "versionName": "1.1.22", + "versionCode": "20250530", "transformPx": false, "app-plus": { "usingComponents": true, diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index ba81322..78c6a09 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -105,9 +105,9 @@ let pw = Base64.encode(encodeURIComponent(password.value)) loading.value = true /*生产环境 begin */ - loginApi({ username: un, password: pw }) + // loginApi({ username: un, password: pw }) /*开发环境 begin */ - // loginApi({ username: userName.value, password: password.value, captcha: 'app' }) + loginApi({ username: userName.value, password: password.value, captcha: 'app' }) .then((res : any) => { if (res.success) { const { result } = res diff --git a/src/pages/onlinePreview/detail.vue b/src/pages/onlinePreview/detail.vue index 924a06a..9c780cc 100644 --- a/src/pages/onlinePreview/detail.vue +++ b/src/pages/onlinePreview/detail.vue @@ -43,6 +43,7 @@ } from '@dcloudio/uni-app'; const detail = ref({}) const detailArr = ref([]) + const ifBackAll = ref(false); //判断是否直接返回最上级 //判断是否h5 by 闵 var ifH5 = false; const onlinePreview = (url) => { //在线预览文件 by 闵 @@ -57,6 +58,7 @@ } onLoad((options) => { + console.log(2222) detail.value = options.data detailArr.value = options.data.split(","); //#ifdef H5 || MP-WEIXIN @@ -64,9 +66,23 @@ //#endif //判断是否只有一个文件 if (detailArr.value && detailArr.value.length == 1) { + let url = '/pages/onlinePreview/onlinePreview'; if (ifH5) url = '/pages/onlinePreview/onlinePreviewH5' - onlinePreview(url + `?data=${JSON.stringify(options.data)}`); + uni.navigateTo({ //跳转成功赋予状态 + url: url + `?data=${JSON.stringify(options.data)}`, + success: () => ifBackAll.value = true //只有一个文件，且加载了 + }) + } + }) + + onShow (()=>{ + //页面卸载，如果是从 + console.log(ifBackAll.value) + if(ifBackAll.value){ + //直接返回上一级 + uni.navigateBack({ + }) } }) diff --git a/src/pages/production/index.vue b/src/pages/production/index.vue index adcac4f..75cab1e 100644 --- a/src/pages/production/index.vue +++ b/src/pages/production/index.vue @@ -19,7 +19,7 @@ @clickItem="onClickItem" styleType="button" activeColor="#0055ff"> - + @@ -35,7 +35,7 @@ - + @@ -98,6 +98,11 @@ window.removeEventListener('resize', calculateScrollViewHeight); }); + onHide(()=>{ //切换首页后，将生产切换为日本数据以清楚定时 by闵 + console.log(555555) + current.value = 0; + }) + const calculateScrollViewHeight = () => { // 获取屏幕的总高度 const screenHeight = uni.getSystemInfoSync().windowHeight; diff --git a/src/pages/production/shishishuju/trqSssj.vue b/src/pages/production/shishishuju/trqSssj.vue index 44245a1..cda0622 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; From 692434f249c432a508e2a0d847a7fef1e2c9e765 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Wed, 4 Jun 2025 17:17:40 +0800 Subject: [PATCH 2/6] 2.0.0 --- env/.env.development | 4 ++-- manifest.config.ts | 2 +- src/manifest.json | 2 +- src/pages-humanResource/absence/add.vue | 2 +- src/pages-operate/file/detail.vue | 6 ++++-- src/pages-process/components/historicalTasks.vue | 1 + 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/env/.env.development b/env/.env.development index c78f0dc..09ee786 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,6 +4,6 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file +#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file diff --git a/manifest.config.ts b/manifest.config.ts index 9630047..4e0b70d 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: '20250604', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ diff --git a/src/manifest.json b/src/manifest.json index 43a36a8..e9a1c98 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "appid": "__UNI__9F097F0", "description": "", "versionName": "2.0.0", - "versionCode": "20250603", + "versionCode": "20250604", "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-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 From 8a90f9e3ef7ef35baf7d38583d553e0a67d0dc25 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Wed, 4 Jun 2025 17:59:00 +0800 Subject: [PATCH 3/6] 1 --- src/pages/login/login.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 2e1ebfd..385a637 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -105,9 +105,9 @@ let pw = Base64.encode(encodeURIComponent(password.value)) loading.value = true /*生产环境 begin */ - // loginApi({ username: un, password: pw }) + loginApi({ username: un, password: pw }) /*开发环境 begin */ - loginApi({ username: userName.value, password: password.value, captcha: 'app' }) + // loginApi({ username: userName.value, password: password.value, captcha: 'app' }) .then((res : any) => { if (res.success) { const { result } = res From 87188cb3f9f5b2ac6e02a8c733a965b88f491d9f Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Thu, 5 Jun 2025 17:48:08 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env.development | 4 ++-- src/pages-humanResource/personnel/ageStatistics.vue | 2 +- src/pages/onlinePreview/onlinePreview.vue | 3 --- src/pages/onlinePreview/onlinePreviewH5.vue | 3 --- src/pages/production/ribaoshuju/trqRbsj.vue | 2 +- src/pages/production/ribaoshuju/yyRbsj.vue | 2 +- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/env/.env.development b/env/.env.development index 09ee786..c78f0dc 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,6 +4,6 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' +#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file +VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file 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/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/onlinePreview/onlinePreviewH5.vue b/src/pages/onlinePreview/onlinePreviewH5.vue index ecd787b..1701791 100644 --- a/src/pages/onlinePreview/onlinePreviewH5.vue +++ b/src/pages/onlinePreview/onlinePreviewH5.vue @@ -16,9 +16,6 @@ import { onLoad } from '@dcloudio/uni-app'; - import { - getEnvBaseUrl - } from '@/utils/index' import { Base64 } from 'js-base64' diff --git a/src/pages/production/ribaoshuju/trqRbsj.vue b/src/pages/production/ribaoshuju/trqRbsj.vue index 3df3cfd..f624fac 100644 --- a/src/pages/production/ribaoshuju/trqRbsj.vue +++ b/src/pages/production/ribaoshuju/trqRbsj.vue @@ -314,7 +314,7 @@ function goHistory(val) { uni.navigateTo({ - url: '/pages/views/shengchan/ribaoshuju/rbsjLsxq?data=' + JSON.stringify(val) + '&type=trq' + url: '/pages/production/ribaoshuju/rbsjLsxq?data=' + JSON.stringify(val) + '&type=trq' }); } diff --git a/src/pages/production/ribaoshuju/yyRbsj.vue b/src/pages/production/ribaoshuju/yyRbsj.vue index 1c94c41..8d14647 100644 --- a/src/pages/production/ribaoshuju/yyRbsj.vue +++ b/src/pages/production/ribaoshuju/yyRbsj.vue @@ -123,7 +123,7 @@ function goHistory(val) { uni.navigateTo({ - url: '/pages/views/shengchan/ribaoshuju/rbsjLsxq?data=' + JSON.stringify(val) + '&type=yy' + url: '/pages/production/ribaoshuju/rbsjLsxq?data=' + JSON.stringify(val) + '&type=yy' }); } const getJinriYuanyouShengchansj = () => { From f7adf50bb3c5b72ecd032ad8d830d5aa8d442021 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Fri, 6 Jun 2025 17:01:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=A0=BC=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.config.ts | 2 +- src/manifest.json | 2 +- src/pages.json | 7 +- src/pages/production/index.vue | 1 - src/pages/production/ribaoshuju/rbsjLsxq.vue | 142 +++----------- src/pages/production/ribaoshuju/trqRbsj.vue | 189 ++++--------------- src/pages/production/ribaoshuju/yyRbsj.vue | 168 ++++------------- src/pages/production/shishishuju/index.vue | 15 +- 8 files changed, 116 insertions(+), 410 deletions(-) diff --git a/manifest.config.ts b/manifest.config.ts index 4e0b70d..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: '20250604', + versionCode: '20250605', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ diff --git a/src/manifest.json b/src/manifest.json index e9a1c98..5fdabbc 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "appid": "__UNI__9F097F0", "description": "", "versionName": "2.0.0", - "versionCode": "20250604", + "versionCode": "20250605", "transformPx": false, "app-plus": { "usingComponents": true, diff --git a/src/pages.json b/src/pages.json index 73adb11..7468f94 100644 --- a/src/pages.json +++ b/src/pages.json @@ -168,7 +168,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/production/index.vue b/src/pages/production/index.vue index 75cab1e..9241069 100644 --- a/src/pages/production/index.vue +++ b/src/pages/production/index.vue @@ -99,7 +99,6 @@ }); onHide(()=>{ //切换首页后，将生产切换为日本数据以清楚定时 by闵 - console.log(555555) current.value = 0; }) 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 From 1b31ccdf348b458fcdea2130dd6b2e44fe2a7884 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Fri, 6 Jun 2025 17:46:49 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/production/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/production/index.vue b/src/pages/production/index.vue index 9241069..0181ff7 100644 --- a/src/pages/production/index.vue +++ b/src/pages/production/index.vue @@ -12,7 +12,7 @@ - +