From cb8f781c90ebde8b344f498addff864de44e05b7 Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Wed, 19 Nov 2025 16:52:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 2 +- pages/NursingNew/component/nurse/index.vue | 23 +++++++++++++++++--- pages/fullcamera.nvue | 6 ++--- pages/login/login.vue | 3 ++- pages/watch/full.vue | 2 +- pages/watch/index.vue | 2 +- unpackage/dist/dev/.nvue/pages/fullcamera.js | 6 ++--- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/pages.json b/pages.json index 80f91a6..0d6b517 100644 --- a/pages.json +++ b/pages.json @@ -54,7 +54,7 @@ "left": "20px", "top": "40px", "width": "800px", - "height": "600px", + "height": "500px", "background": "transparent" } }] diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue index 4a4ceb3..657aa49 100644 --- a/pages/NursingNew/component/nurse/index.vue +++ b/pages/NursingNew/component/nurse/index.vue @@ -420,7 +420,7 @@ @@ -1558,8 +1558,10 @@ } await nextTick() isopen.value = true; + showDetail.value[0] = index0; showDetail.value[1] = index1; + console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage) isopacity.value = false; //加动画 setTimeout(() => { @@ -1800,8 +1802,11 @@ izPackage: 'Y', previewFile: "", previewFileSmall: "", + netPreviewFile:"", + netPreviewFileSmall:"", immediateFile: "", immediateFileFocus: "", + netImmediateFileFocus:"", netImmediateFile: "", tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName, mp3File: allobject.mp3File, @@ -1955,6 +1960,7 @@ serviceDuration: allobject.serviceDuration, immediateFile: allobject.immediateFile, immediateFileFocus: allobject.immediateFileFocus, + netImmediateFileFocus:allobject.netImmediateFileFocus, netImmediateFile: allobject.netImmediateFile, tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName, mp3File: allobject.mp3File, @@ -1962,6 +1968,8 @@ mp4File: allobject.mp4File, netMp4File: allobject.netMp4File, serviceContent: allobject.serviceContent, + netPreviewFile:allobject.netPreviewFile, + netPreviewFileSmall:allobject.netPreviewFileSmall, } //给表格赋值 timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param; @@ -2124,8 +2132,9 @@ savePackagelist.value = uni.getStorageSync('Packagelist') || [] let res = uni.getStorageSync('saveTree') - - // console.log("jiance", savePackagelist.value, res) + + + console.log("saveTree", res) let goodArray = [] myArray.forEach((element : any) => { @@ -2218,8 +2227,16 @@ serviceDuration: "", immediateFile: "", immediateFileFocus: "", + netImmediateFileFocus:"", netImmediateFile: "", tagName: "", + netPreviewFile:"", + netPreviewFileSmall:"", + mp3File:"", + netMp3File:"", + mp4File:"", + netMp4File:"", + serviceContent:"", }) // 切割bigArray function splitString(str) { diff --git a/pages/fullcamera.nvue b/pages/fullcamera.nvue index 6becb07..7a37bff 100644 --- a/pages/fullcamera.nvue +++ b/pages/fullcamera.nvue @@ -1,7 +1,7 @@ @@ -615,7 +615,7 @@ \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 93cc090..c4710ce 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -202,7 +202,7 @@ const getImg = () => { if (/^\d{11}$/.test(form.username)) { isRel(form.username).then((res : any) => { - + console.log("啥啊",res) if (res.result.code == `0`) { uni.setStorageSync('serverUrl', res.result.orgList[0].serverUrl); uni.setStorageSync('orgList', res.result.orgList); @@ -210,6 +210,7 @@ time.value = Date.now(); getLoginCode(time.value).then((res : any) => { + console.log("啥啊",res) form.captcha = res.message canclick.value = true }) diff --git a/pages/watch/full.vue b/pages/watch/full.vue index 850e5fa..4e661bd 100644 --- a/pages/watch/full.vue +++ b/pages/watch/full.vue @@ -603,7 +603,7 @@ margin-left: -15rpx; margin-top: 20rpx; width: 1600rpx; - height: 1200rpx; + height: 1000rpx; border-radius: 55rpx; overflow: hidden; display: flex; diff --git a/pages/watch/index.vue b/pages/watch/index.vue index 1acda4b..129e695 100644 --- a/pages/watch/index.vue +++ b/pages/watch/index.vue @@ -1567,7 +1567,7 @@ .pao { position: absolute; - right: 30rpx; + right: 20rpx; top: 10rpx; width: 85rpx; height: 40rpx; diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js index fc534ca..dd59bdc 100644 --- a/unpackage/dist/dev/.nvue/pages/fullcamera.js +++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js @@ -1,6 +1,6 @@ import { _ as _export_sfc, f as formatAppLog, r as requireNativePlugin } from "../_plugin-vue_export-helper.js"; import { resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeStyle, createCommentVNode, createVNode } from "vue"; -const _style_0 = { "center-column": { "": { "width": 800, "height": 600, "overflow": "hidden" } } }; +const _style_0 = { "center-column": { "": { "width": 800, "height": 500, "overflow": "hidden" } } }; const _sfc_main = { data() { return { @@ -558,14 +558,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { "div", { class: "center-column", - style: normalizeStyle({ height: $data.isshow ? "600px" : "0px" }) + style: normalizeStyle({ height: $data.isshow ? "500px" : "0px" }) }, [ createCommentVNode(" 视频播放组件 "), createVNode(_component_MonitorView, { ref: "monitor", init: "5", - style: { "width": "800px", "height": "600px" }, + style: { "width": "800px", "height": "500px" }, onOnTel: $options.handleTelEvent, onOnSnapShot: $options.handleSnapShotEvent, onOnRecord: $options.handleRecordEvent, From abfe695879a7e2b11ecd63f2e158753db8c681da Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Wed, 19 Nov 2025 16:52:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- unpackage/dist/dev/.nvue/pages/camera.js | 2 +- unpackage/dist/dev/.nvue/pages/fullcamera.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js index 04100f2..12310ff 100644 --- a/unpackage/dist/dev/.nvue/pages/camera.js +++ b/unpackage/dist/dev/.nvue/pages/camera.js @@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { ) ]); } -const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]); +const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]); export { camera as default }; diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js index c959abe..dd59bdc 100644 --- a/unpackage/dist/dev/.nvue/pages/fullcamera.js +++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js @@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { ) ]); } -const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]); +const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]); export { fullcamera as default };