Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
27d3224b0a
|
|
@ -79,7 +79,7 @@ class WsRequest {
|
|||
}
|
||||
return String(a);
|
||||
}).join(' ');
|
||||
console.log('[WsRequest]', out);
|
||||
// console.log('[WsRequest]', out);
|
||||
}
|
||||
|
||||
// ---------- 对外控制 ----------
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
import { queryOrderlist,startDirectiveServe,finishDirectiveServe,queryOrderInfoList } from '@/pages/procurement/api/lunpan.js'
|
||||
import { startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '@/pages/NursingNew/component/doctorask/api/api.js'
|
||||
const qcobj = ref({})
|
||||
const openleft = ref(true)
|
||||
const openleft = ref(false)
|
||||
const open = ref(0);
|
||||
const zdcont = ref('');
|
||||
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
|
||||
|
|
|
|||
|
|
@ -523,7 +523,7 @@
|
|||
<view style="margin-top: 30rpx;">
|
||||
{{uni.getStorageSync('nuName')}}
|
||||
<text style="color: #1083F8;">
|
||||
{{uni.getStorageSync('NUall').elderInfo?uni.getStorageSync('NUall').elderInfo.name:""}}
|
||||
{{uni.getStorageSync('NUall').elderInfo?uni.getStorageSync('NUall').elderInfo?.name:""}}
|
||||
</text>
|
||||
</view>
|
||||
<view class="blue-button">
|
||||
|
|
@ -1328,7 +1328,7 @@
|
|||
}
|
||||
|
||||
const addnew = () => {
|
||||
|
||||
|
||||
if (isDelete.value) {
|
||||
isDelete.value = false;
|
||||
deleteRuler(saveEditIndex.value.index0, saveEditIndex.value.index1);
|
||||
|
|
@ -1376,7 +1376,7 @@
|
|||
nuId: uni.getStorageSync('nuId'),
|
||||
nuName: uni.getStorageSync('nuName'),
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
elderName: uni.getStorageSync('NUall').elderInfo.name,
|
||||
elderName: uni.getStorageSync('NUall').elderInfo?.name?uni.getStorageSync('NUall').elderInfo?.name:"",
|
||||
directiveId: allobject.id,
|
||||
directiveName: allobject.packageName,
|
||||
typeId: "",
|
||||
|
|
@ -1454,7 +1454,7 @@
|
|||
pushValue.nuId = uni.getStorageSync('nuId');
|
||||
pushValue.nuName = uni.getStorageSync('nuName');
|
||||
pushValue.elderId = uni.getStorageSync('elderId');
|
||||
pushValue.elderName = uni.getStorageSync('NUall').elderInfo.name;
|
||||
pushValue.elderName = uni.getStorageSync('NUall').elderInfo?.name ? uni.getStorageSync('NUall').elderInfo?.name:"";
|
||||
bottomItems.value.unshift(pushValue)
|
||||
// 实现即时指令动画
|
||||
cleansettimeout.value = setTimeout(() => {
|
||||
|
|
@ -1527,7 +1527,7 @@
|
|||
nuId: uni.getStorageSync('nuId'),
|
||||
nuName: uni.getStorageSync('nuName'),
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
elderName: uni.getStorageSync('NUall').elderInfo.name,
|
||||
elderName: uni.getStorageSync('NUall').elderInfo?.name ? uni.getStorageSync('NUall').elderInfo?.name :"",
|
||||
directiveId: allobject.id,
|
||||
directiveName: allobject.title,
|
||||
typeId: allobject.typeId,
|
||||
|
|
@ -1599,7 +1599,7 @@
|
|||
nuId: uni.getStorageSync('nuId'),
|
||||
nuName: uni.getStorageSync('nuName'),
|
||||
elderId: uni.getStorageSync('elderId'),
|
||||
elderName: uni.getStorageSync('NUall').elderInfo.name,
|
||||
elderName: uni.getStorageSync('NUall').elderInfo?.name?uni.getStorageSync('NUall').elderInfo?.name:"",
|
||||
tagList: info
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@
|
|||
<view class="history-left">
|
||||
<view
|
||||
:class="item.executeStatus!==`hisOk`?`history-left-jiao-error`: `history-left-jiao`"
|
||||
style="top: 2rpx;right: 2rpx;"
|
||||
style="top: 1.5rpx;right: 1.5rpx;"
|
||||
v-show="secondListTargetShow !== index">
|
||||
{{ item.rightshow }}
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
.que {
|
||||
position: fixed;
|
||||
top: 9%;
|
||||
left: 12%;
|
||||
width: 76%;
|
||||
left: 10%;
|
||||
width: 85%;
|
||||
height: 88%;
|
||||
z-index: 100;
|
||||
background-color: #eff0f4;
|
||||
background-color: #f5f6fa;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
|
|
|||
Loading…
Reference in New Issue