改了一堆逻辑

This commit is contained in:
Teng 2025-10-20 17:00:06 +08:00
parent da263c97a0
commit a661f181de
43 changed files with 570 additions and 373 deletions

View File

@ -2,8 +2,8 @@
"name" : "护理单元",
"appid" : "__UNI__FB2D473",
"description" : "护理单元",
"versionName" : "1.6.7",
"versionCode" : 167,
"versionName" : "1.6.8",
"versionCode" : 168,
"transformPx" : false,
/* 5+App */
"app-plus" : {

View File

@ -363,7 +363,7 @@
top: 2rpx;
right: 8rpx;
font-size: 19rpx;
z-index: 999;
z-index: 9999;
}
.right-box-font {

View File

@ -387,7 +387,7 @@
:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
@click.stop>
<view class="popup-overlay-content-left">
<image class="popup-overlay-content-left-img" :src="`/static/index/teeth.png`" />
<image class="popup-overlay-content-left-img" :src="timearr[showDetail[0]]?.children[showDetail[1]]?.netImmediateFileFocus" />
<!-- <text class="popup-overlay-content-left-font">
{{ timearr[flyNumber.index0]?.children[flyNumber.index1]?.value }}
</text> -->
@ -1570,30 +1570,30 @@
const indexsave = ref([-1, -1]);
// ()
const rulerMoveEnd = (object : any) => {
if (props.liang.index0 !== 999 && object.cycleType) {
indexsave.value = [props.liang.index0, props.liang.index1]
// tagName
let tagName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].tagName
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: '', tagName: tagName }
//
let newtagName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName
timearr.value[indexsave.value[0]].children[indexsave.value[1]] = object
timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName = newtagName
let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
let positioning = timearr.value[indexsave.value[0]].positioning
const rest = startTime.split(":")[1]; // ":20"
const rest0 = endTime.split(":")[1];; // ":20"
let many = Number(rest0) - Number(rest);
let start = newtagName
let end = Number(start) + many
// positioning
timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime = positioning + ":" + start.padStart(2, '0'); // "9:20"
timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime = positioning + ":" + String(end % 60).padStart(2, '0'); // "9:20"
// children value
}
}
// const rulerMoveEnd = (object : any) => {
// if (props.liang.index0 !== 999 && object.cycleType) {
// indexsave.value = [props.liang.index0, props.liang.index1]
// // tagName
// let tagName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].tagName
// timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: '', tagName: tagName }
// //
// let newtagName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName
// timearr.value[indexsave.value[0]].children[indexsave.value[1]] = object
// timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName = newtagName
// let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
// let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
// let positioning = timearr.value[indexsave.value[0]].positioning
// const rest = startTime.split(":")[1]; // ":20"
// const rest0 = endTime.split(":")[1];; // ":20"
// let many = Number(rest0) - Number(rest);
// let start = newtagName
// let end = Number(start) + many
// // positioning
// timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime = positioning + ":" + start.padStart(2, '0'); // "9:20"
// timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime = positioning + ":" + String(end % 60).padStart(2, '0'); // "9:20"
// // children value
// }
// }
const scrollContainer = ref(null)
const opensay = () => {
sayisopacity.value = false;
@ -1672,15 +1672,17 @@
//
cleansettimeout.value = setTimeout(() => {
bottomItems.value[0].target = `#fff`;
saveAll()
}, 1500)
} else {
clearTimeout(cleansettimeoutrel.value);
isop.value = true;
cleansettimeoutrel.value = setTimeout(() => {
isop.value = false;
saveAll()
}, 1500)
}
saveAll()
})
return
}
@ -1718,7 +1720,7 @@
}
const startHour = Number(saveEditIndex.value.index0)
const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName)
const endMinute = startMinute + 10
const endMinute = startMinute + Number(allobject.serviceDuration)
const endHour = startHour + Math.floor(endMinute / 60)
const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}`
const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
@ -1745,7 +1747,7 @@
// immediateFileFocus:"",
// tagName: "",
// })
console.log("))))",allobject.cycleTypeId)
// console.log("))))",allobject.cycleTypeId)
let param = {
directiveId: allobject.id,
directiveName: allobject.title,
@ -1763,6 +1765,7 @@
izPackage: '0',
previewFile: allobject.previewFile,
previewFileSmall: allobject.previewFileSmall,
serviceDuration: allobject.serviceDuration,
immediateFile: allobject.immediateFile,
immediateFileFocus: allobject.immediateFileFocus,
netImmediateFile: allobject.netImmediateFile,
@ -1837,7 +1840,7 @@
instantList: bottomItems.value,
tagList: info
}
// console.log("", allvalue)
console.log("提交的", allvalue)
addBatch(allvalue).then(() => {
@ -1910,7 +1913,7 @@
onShow(() => {
getServiceTree().then((res : any) => {
// console.log("?????",res)
console.log("?????",res)
res.result.forEach((element : any) => {
if (element.netFlag == '0') {
doctorsayList.value.forEach((res : any) => {
@ -2008,9 +2011,9 @@
solveWatch.value = 3;
whereEvent(data)
}
defineExpose({
rulerMoveEnd,
})
// defineExpose({
// rulerMoveEnd,
// })
const moveNumber = ref({
index0: 999,
@ -2037,6 +2040,7 @@
izPackage: '0',
previewFile: "",
previewFileSmall: "",
serviceDuration:"",
immediateFile: "",
immediateFileFocus: "",
netImmediateFile: "",

View File

@ -131,11 +131,14 @@
<view class="big-font">
请选择您的机构
</view>
<view class="small-father">
<view class="small-select" v-for="(item,index) in allserve" @click="changeServe(item.serverUrl)">
{{ item.orgCode }}
<view class="">
<view class="small-father">
<view class="small-select" v-for="(item,index) in allserve" @click="changeServe(item.serverUrl)">
{{ item.departName }}
</view>
</view>
</view>
</view>
</view>
@ -201,9 +204,12 @@
const getImg = () => {
if (/^\d{11}$/.test(form.username)) {
isRel(form.username).then((res : any) => {
console.log("6666",res.result)
if (res.result.code == `0`) {
uni.setStorageSync('serverUrl', res.result.orgList[0].serverUrl);
uni.setStorageSync('orgList', res.result.orgList);
allserve.value = res.result.orgList
console.log("11111",allserve.value)
time.value = Date.now();
getLoginCode(time.value).then((res : any) => {
@ -708,7 +714,6 @@
width: 1200rpx;
height: 1200rpx;
border-radius: 30rpx;
flex-direction: column;
.big-font {
@ -717,17 +722,19 @@
.small-father {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
flex-direction: column;
}
.small-select {
display: flex;
justify-content: center;
align-items: center;
width: 200rpx;
width: 600rpx;
height: 200rpx;
margin: 200rpx;
margin-top: 50rpx;
padding: 30rpx;
border-radius: 30rpx;
border: 2rpx solid;
font-size: 32rpx;

View File

@ -67,7 +67,7 @@
style="flex-direction: column;overflow: hidden;">
<image v-show="item1.startTime"
style="width: 50rpx;height: 50rpx;margin: 0 auto;"
src="/static/index/tu.png" />
:src="item1.netImmediateFile" />
<view class="title-time-time" style="font-size: 30rpx;"
v-show="scalcType<10">
{{item1.startTime + `-` + item1.endTime}}

View File

@ -179,9 +179,9 @@
<image style="width: 100rpx;height: 100rpx;"
:src="`https://www.focusnu.com/nursingunit101/sys/common/static/${serveritem.immediateFile}`" />
</view>
<view style="height: 200rpx;">
<!-- <view style="height: 150rpx;">
</view>
</view> -->
<!-- <view class="juzhong" style="top: -120rpx;">
<donghua :width="`600rpx`" :height="`500rpx`" :links="blueArray" :playing="photoplay"
:loop="true" :interval="120" />
@ -191,7 +191,7 @@
:loop="true" :interval="120" />
</view> -->
<!-- <image style="width: 300rpx;height: 200rpx;" src="/static/index/newindex/wendu/2.png" /> -->
<view style="font-size: 25rpx;">
<view style="font-size: 25rpx;padding-top: 150rpx;">
{{ serveritem.typeName }}
</view>
@ -1442,6 +1442,7 @@
.font-weight {
font-size: 30rpx;
font-weight: 600;
}
.font-small {
@ -1527,7 +1528,7 @@
.font-weight {
font-size: 40rpx;
margin-top: 30rpx;
margin-top: 50rpx;
font-weight: 600;
}
@ -1656,7 +1657,7 @@
.zhezhao-top {
position: absolute;
top: 220rpx;
top: 200rpx;
left: 0%;
width: 450rpx;
height: 120rpx;

View File

@ -69,6 +69,23 @@
<oneseven v-if="opentype" />
</view>
</view>
</view>
<view class="bg-mask" v-if="selectserve">
<view @click.stop class="white-select">
<view class="big-font">
请选择您的机构
</view>
<view class="">
<view class="small-father">
<view class="small-select"
:style="serverUrl==item.serverUrl?{color:`#0083FF`,borderColor:`#0083FF`}:{}"
v-for="(item,index) in allserve" @click="changeServe(item.serverUrl)">
{{ item.departName }}
</view>
</view>
</view>
</view>
</view>
</template>
@ -93,6 +110,22 @@
const transition = ref(true)
const uuid = ref("")
const selectserve = ref(false)
const allserve = ref(uni.getStorageSync('orgList'))
const changeServe = (url : string) => {
uni.setStorageSync('serverUrl', url);
uni.showToast({
title: '切换机构成功',
icon: 'success', //
duration: 2000 //
});
selectserve.value = false;
// setTimeout(() => {
// jumpTo(`/pages/watch/index`)
// }, 500)
}
//
// watch(
@ -105,7 +138,8 @@
// }
// }
// )
const animation = ref(false)
const animation = ref(false);
const serverUrl = ref("")
const jumpToTarget = (index : number) => {
switch (index) {
case 0:
@ -127,7 +161,18 @@
resetshow.value = true
break
case 4:
if (allserve.value.length == 1) {
uni.showToast({
title: `您目前只绑定了一个机构。如需切换,请先申请新的机构。`,
icon: 'none', //
duration: 2000 //
});
} else {
serverUrl.value = uni.getStorageSync('serverUrl')
selectserve.value = true;
// console.log("!!!!", allserve.value)
}
break
case 5:
issay.value = true;
@ -305,4 +350,53 @@
display: flex;
justify-content: center;
}
.bg-mask {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
background: rgba(0, 0, 0, 0.3);
backdrop-filter: blur(5rpx);
z-index: 998;
display: flex;
justify-content: center;
align-items: center;
.white-select {
display: flex;
justify-content: center;
align-items: center;
background-color: #fff;
width: 1200rpx;
height: 1200rpx;
border-radius: 30rpx;
flex-direction: column;
.big-font {
font-size: 35rpx;
}
.small-father {
display: flex;
align-items: center;
flex-wrap: wrap;
flex-direction: column;
}
.small-select {
display: flex;
justify-content: center;
align-items: center;
width: 600rpx;
height: 200rpx;
margin-top: 50rpx;
padding: 30rpx;
border-radius: 30rpx;
border: 2rpx solid;
font-size: 32rpx;
}
}
}
</style>

View File

@ -1,6 +1,6 @@
// 全局请求封装
const base_url = 'https://www.focusnu.com/devopsapi'
// const base_url = 'http://192.168.2.28:8081/devopsapi'
// const base_url = 'http://192.168.2.26:8081/devopsapi'
// 请求超出时间
const timeout = 5000

View File

@ -1,6 +1,6 @@
// 全局请求封装
const base_url = 'https://www.focusnu.com/opeapi'
// const base_url = 'http://192.168.2.28:8081/opeapi'
// const base_url = 'http://192.168.2.26:8081/opeapi'
// 请求超出时间
const timeout = 5000

View File

@ -9,7 +9,7 @@ function formatAppLog(type, filename, ...args) {
console[type].apply(console, [...args, filename]);
}
}
const _style_0 = { "center-column": { "": { "width": 650, "height": 510, "borderRadius": 30, "overflow": "hidden" } } };
const _style_0 = { "center-column": { "": { "width": 680, "height": 520, "borderRadius": 30, "overflow": "hidden" } } };
const _export_sfc = (sfc, props) => {
const target = sfc.__vccOpts || sfc;
for (const [key, val] of props) {
@ -570,12 +570,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
}, [
createElementVNode("div", {
class: "center-column",
style: normalizeStyle({ height: $data.isshow ? "510px" : "0px" })
style: normalizeStyle({ height: $data.isshow ? "520px" : "0px" })
}, [
createVNode(_component_MonitorView, {
ref: "monitor",
init: "5",
style: { "width": "650px", "height": "510px" },
style: { "width": "680px", "height": "520px" },
onOnTel: $options.handleTelEvent,
onOnSnapShot: $options.handleSnapShotEvent,
onOnRecord: $options.handleRecordEvent,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -7,8 +7,8 @@
"id": "__UNI__FB2D473",
"name": "护理单元",
"version": {
"name": "1.6.7",
"code": 167
"name": "1.6.8",
"code": 168
},
"description": "护理单元",
"developer": {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 794 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -591,7 +591,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/pages/camera.nvue"]]);
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
export {
camera as default
};

File diff suppressed because it is too large Load Diff

View File

@ -7,8 +7,8 @@
"id": "__UNI__FB2D473",
"name": "护理单元",
"version": {
"name": "1.6.7",
"code": 167
"name": "1.6.8",
"code": 168
},
"description": "护理单元",
"developer": {

View File

@ -688,7 +688,7 @@
top: 0.0625rem;
right: 0.25rem;
font-size: 0.59375rem;
z-index: 999;
z-index: 9999;
}
.super-card .middle-box .middle-left-box .first-contant .right-box-item .right-box-font[data-v-c3fbc13d] {
font-size: 0.71875rem;

View File

@ -63,7 +63,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
}
});
// ../../../../项目/hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
// ../../../../hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
var import_vue = __toESM(require_vue());
function requireNativePlugin(name) {
return weex.requireModule(name);
@ -657,7 +657,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
)
]);
}
var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/\u9879\u76EE/hldy_app/pages/camera.nvue"]]);
var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
// <stdin>
var webview = plus.webview.currentWebview();

View File

@ -1905,16 +1905,18 @@ to {
}
.white-select .small-father[data-v-e4e4508d] {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
flex-direction: column;
}
.white-select .small-select[data-v-e4e4508d] {
display: flex;
justify-content: center;
align-items: center;
width: 6.25rem;
width: 18.75rem;
height: 6.25rem;
margin: 6.25rem;
margin-top: 1.5625rem;
padding: 0.9375rem;
border-radius: 0.9375rem;
border: 0.0625rem solid;
font-size: 1rem;

View File

@ -334,7 +334,7 @@
}
.big-view .font-weight[data-v-4b26e9e6] {
font-size: 1.25rem;
margin-top: 0.9375rem;
margin-top: 1.5625rem;
font-weight: 600;
}
.big-view .pao[data-v-4b26e9e6] {
@ -438,7 +438,7 @@
}
.zhezhao-top[data-v-4b26e9e6] {
position: absolute;
top: 6.875rem;
top: 6.25rem;
left: 0%;
width: 14.0625rem;
height: 3.75rem;

View File

@ -1830,3 +1830,48 @@ uni-button.cuIcon.lg[data-v-bf1d6c35] {
display: flex;
justify-content: center;
}
.bg-mask[data-v-57949c5e] {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
background: rgba(0, 0, 0, 0.3);
-webkit-backdrop-filter: blur(0.15625rem);
backdrop-filter: blur(0.15625rem);
z-index: 998;
display: flex;
justify-content: center;
align-items: center;
}
.bg-mask .white-select[data-v-57949c5e] {
display: flex;
justify-content: center;
align-items: center;
background-color: #fff;
width: 37.5rem;
height: 37.5rem;
border-radius: 0.9375rem;
flex-direction: column;
}
.bg-mask .white-select .big-font[data-v-57949c5e] {
font-size: 1.09375rem;
}
.bg-mask .white-select .small-father[data-v-57949c5e] {
display: flex;
align-items: center;
flex-wrap: wrap;
flex-direction: column;
}
.bg-mask .white-select .small-select[data-v-57949c5e] {
display: flex;
justify-content: center;
align-items: center;
width: 18.75rem;
height: 6.25rem;
margin-top: 1.5625rem;
padding: 0.9375rem;
border-radius: 0.9375rem;
border: 0.0625rem solid;
font-size: 1rem;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.6.7","code":167},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.6.8","code":168},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 794 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 28 KiB