合并,更新新版本
This commit is contained in:
parent
8176a9e2b7
commit
1ce9cb2eb5
|
|
@ -79,23 +79,6 @@ export const waterwaterRead = (cid,address) => {
|
|||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// ===============================================
|
||||
// 智能水表设备信息清零
|
||||
// export const waterwaterReset = (cid,address) => {
|
||||
// return request({
|
||||
// url: `${uni.getStorageSync('serverUrl')}/api/iot/water/waterReset?cid=${cid}&address=${address}`,
|
||||
// method: 'get'
|
||||
// })
|
||||
// }
|
||||
|
||||
// 智能水表设备拉闸合闸
|
||||
// export const waterwaterControl = (cid,address,type) => {
|
||||
// return request({
|
||||
// url: `${uni.getStorageSync('serverUrl')}/api/iot/water/waterControl?cid=${cid}&address=${address}&type=${type}`,
|
||||
// method: 'get'
|
||||
// })
|
||||
// }
|
||||
// 摄像头报修
|
||||
export const cameraInfobaoxiu = (id) => {
|
||||
return request({
|
||||
|
|
@ -123,4 +106,36 @@ export const updateDeviceRealTime = (sn) => {
|
|||
url: `${uni.getStorageSync('serverUrl')}/api/iot/humidDevice/updateDeviceRealTime?sn=${sn}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 三张日志
|
||||
|
||||
// 电表日志
|
||||
export const electricityMeterListArray = (data) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/iot/requestLog/list?column=createTime&order=desc&pageNo=${data.pageNo}&pageSize=${data.pageSize}&cid=${data.cid}&type=${data.type}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
// 水表日志
|
||||
export const requestLogList = (data) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/iot/requestLog/list?column=createTime&order=desc&pageNo=${data.pageNo}&pageSize=${data.pageSize}&cid=${data.cid}&type=${data.type}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 温湿度计日志
|
||||
export const humidDevicejgList = (data) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/iot/humidDevice/logList?column=createTime&order=desc&pageNo=${data.pageNo}&pageSize=${data.pageSize}&optType=read&sn=${data.sn}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
// 温湿度计告警日志
|
||||
export const humidDevicejgwarn = (data) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/iot/humidDevice/jglist?column=createTime&order=desc&pageNo=${data.pageNo}&pageSize=${data.pageSize}&optType=read&sn=${data.sn}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -10,9 +10,9 @@
|
|||
<view class="right-icons">
|
||||
<view class="right-container-tem">
|
||||
<image class="right-container-tem-img" src="/static/index/newindex/wendu/0.png" />
|
||||
<text class="right-container-tem-text">23°C</text>
|
||||
<text class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C</text>
|
||||
<image class="right-container-tem-img" src="/static/index/newindex/wendu/1.png" />
|
||||
<text class="right-container-tem-text">39%</text>
|
||||
<text class="right-container-tem-text">{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].humidity: '-' }}%</text>
|
||||
</view>
|
||||
|
||||
<image class="right-icons-img" :src="`/static/index/undericons/man.png`" />
|
||||
|
|
@ -586,11 +586,11 @@
|
|||
})
|
||||
const lanjie = ref(false);
|
||||
const clean = () => {
|
||||
if(movetype.value==-1){
|
||||
if (movetype.value == -1) {
|
||||
lanjie.value = true;
|
||||
emit("cleanmain")
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,7 @@
|
|||
未选择
|
||||
</view>
|
||||
<view v-for="(item,index) in bodyTagListLook" :key="index">
|
||||
<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;"
|
||||
:src="item" />
|
||||
<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="tri-down" @click="openbody=!openbody;openface=false"></view>
|
||||
|
|
@ -77,8 +76,7 @@
|
|||
未选择
|
||||
</view>
|
||||
<view v-for="(item,index) in emotionTagListLook" :key="index">
|
||||
<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;"
|
||||
:src="item" />
|
||||
<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;" :src="item" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -137,7 +135,6 @@
|
|||
:style="!targetRuler.bordershow && saveRulerTime.index0 === index0 && saveRulerTime.index1 === index1 ? {zIndex:999} : {borderBottom: '1rpx solid transparent'}"
|
||||
:id="`a${index0}_${index1}`" style="position: relative;"
|
||||
@click="rulerTouchClick(item1,index0,index1)"
|
||||
@touchstart="rulerTouchStart(item1,index0,index1,$event)"
|
||||
@touchmove="rulerTouchMove" @touchend="rulerTouchEnd()"
|
||||
:data-index0="index0" :data-index1="index1">
|
||||
<view class="time-button-orange-spe"
|
||||
|
|
@ -210,7 +207,6 @@
|
|||
</scroll-view>
|
||||
</view>
|
||||
<view class="right-cards">
|
||||
|
||||
<view style="margin-top: 60rpx;margin-left: 30rpx;">
|
||||
<view class="">
|
||||
即时指令
|
||||
|
|
@ -228,7 +224,10 @@
|
|||
<view :style="{ animationDelay:`-${index * 0.1}s` }"
|
||||
:class="bottomisShaking?`super-end-items-img-father-active`:`super-end-items-img-father`">
|
||||
<image class="right-box-img" :src="item.netImmediateFile" />
|
||||
<view class="right-box-font">{{item.directiveName}}</view>
|
||||
<view class="right-box-font"
|
||||
:style="{fontSize: (item.directiveName?.trim().length > 6) ? '16rpx' : '23rpx' }">
|
||||
{{item.directiveName}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="super-end-items-father-close-father" v-show="bottomisShaking"
|
||||
@click.stop="bottomItems.splice(index, 1);saveAll()">
|
||||
|
|
@ -337,7 +336,6 @@
|
|||
<view class="under-button">
|
||||
<view class="under-button-black" v-if="isop">
|
||||
不能重复添加相同的即时服务指令
|
||||
|
||||
</view>
|
||||
<view class="white-circle" @click="changecard">
|
||||
<image class="white-circle-img"
|
||||
|
|
@ -387,10 +385,8 @@
|
|||
: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="timearr[showDetail[0]]?.children[showDetail[1]]?.netImmediateFileFocus" />
|
||||
<!-- <text class="popup-overlay-content-left-font">
|
||||
{{ timearr[flyNumber.index0]?.children[flyNumber.index1]?.value }}
|
||||
</text> -->
|
||||
<image class="popup-overlay-content-left-img"
|
||||
:src="timearr[showDetail[0]]?.children[showDetail[1]]?.netImmediateFileFocus" />
|
||||
</view>
|
||||
<view class="popup-overlay-content-right">
|
||||
<view class="time-font">
|
||||
|
|
@ -524,7 +520,6 @@
|
|||
nextTick(() => {
|
||||
scrollTop.value = 0;
|
||||
cardLeft.value = 700
|
||||
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
@ -680,9 +675,7 @@
|
|||
} else {
|
||||
movetop(props.propsmove)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
)
|
||||
const bodydonghua = ref(false)
|
||||
|
|
@ -707,12 +700,9 @@
|
|||
}, 50)
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
const bodytarget = ref([]);
|
||||
const facetarget = ref([]);
|
||||
const addbody = (index : number) => {
|
||||
|
||||
if (bodyTagList.value[index].izSelected == '1') {
|
||||
bodyTagList.value[index].izSelected = '0'
|
||||
} else {
|
||||
|
|
@ -727,12 +717,11 @@
|
|||
uni.showToast({
|
||||
title: "标签最多只能添加两个",
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
duration: 3000
|
||||
})
|
||||
return
|
||||
} else {
|
||||
bodyTagList.value[index].izSelected = '1';
|
||||
console.log("????", bodyTagList.value)
|
||||
}
|
||||
}
|
||||
saveAll()
|
||||
|
|
@ -752,8 +741,9 @@
|
|||
uni.showToast({
|
||||
title: "标签最多只能添加两个",
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
duration: 3000
|
||||
})
|
||||
return
|
||||
} else {
|
||||
emotionTagList.value[index].izSelected = '1';
|
||||
}
|
||||
|
|
@ -764,81 +754,9 @@
|
|||
const open = ref(false);
|
||||
const getblue = ref(false);
|
||||
|
||||
const bottomItems = ref([
|
||||
// {
|
||||
// // name: '纸尿裤',
|
||||
// // url: "/static/index/niao.png",
|
||||
// // target: "#fff",
|
||||
// // id: -1
|
||||
// directiveId: "", // 服务指令ID
|
||||
// directiveName: "", // 服务指令名称
|
||||
// typeId: "", // 类型ID
|
||||
// typeName: "", // 类型名称
|
||||
// categoryId: "", // 类别ID
|
||||
// categoryName: "", // 类别名称
|
||||
// izPackage: "", // 是否是服务指令包
|
||||
// previewFile: "", // 大图相对路径
|
||||
// previewFileSmall: "", // 小图相对路径
|
||||
// immediateFile: "", // 图片相对路径
|
||||
// immediateFileFocus: "" // 图片焦点相对路径
|
||||
// },
|
||||
// {
|
||||
// name: '呕吐',
|
||||
// url: "/static/index/tu.png",
|
||||
// target: "#fff",
|
||||
// id: -1
|
||||
// },
|
||||
// {
|
||||
// name: '吸痰',
|
||||
// url: "/static/index/ou.png",
|
||||
// target: "#fff",
|
||||
// id: -1
|
||||
// },
|
||||
// {
|
||||
// name: '大便',
|
||||
// url: "/static/index/baba.png",
|
||||
// target: "#fff",
|
||||
// id: -1
|
||||
// },
|
||||
// {
|
||||
// name: '纸尿裤',
|
||||
// url: "/static/index/niao.png",
|
||||
// target: "#fff",
|
||||
// id: -1
|
||||
// },
|
||||
// {
|
||||
// name: '呕吐',
|
||||
// url: "/static/index/tu.png",
|
||||
// target: "#fff",
|
||||
// id: -1
|
||||
// },
|
||||
// {
|
||||
// name: '吸痰',
|
||||
// url: "/static/index/ou.png",
|
||||
// target: "#fff",
|
||||
// id: -1
|
||||
// },
|
||||
// {
|
||||
// name: '大便',
|
||||
// url: "/static/index/baba.png",
|
||||
// target: "#fff",
|
||||
// id: -1
|
||||
// },
|
||||
])
|
||||
const bottomItems = ref([])
|
||||
const nameArray = [
|
||||
`标准`,
|
||||
`超重`,
|
||||
`强直`,
|
||||
`偏瘫`,
|
||||
`佝偻`,
|
||||
`稳定`,
|
||||
`焦虑`,
|
||||
`抑郁`,
|
||||
`暴力`,
|
||||
`恐惧`,
|
||||
`烦躁`,
|
||||
`易怒`,
|
||||
`臆想`,
|
||||
`标准`,`超重`,`强直`,`偏瘫`,`佝偻`,`稳定`,`焦虑`,`抑郁`,`暴力`,`恐惧`,`烦躁`,`易怒`,`臆想`,
|
||||
]
|
||||
const timeArray = [
|
||||
`00`, `05`, `10`, `15`, `20`, `25`, `30`, `35`, `40`, `45`, `50`, `55`
|
||||
|
|
@ -857,11 +775,6 @@
|
|||
const scrollTop = ref(0)
|
||||
//左下的数组
|
||||
const downList = ref<any>()
|
||||
//左下的数组
|
||||
const rightList = ref<String[]>([
|
||||
// "三分段",
|
||||
// "四分段",
|
||||
])
|
||||
const isop = ref(false);
|
||||
const bigArray = ref([]);
|
||||
const isopen = ref(false)
|
||||
|
|
@ -876,9 +789,6 @@
|
|||
const sayisopen = ref(false);
|
||||
const sayname = ref("")
|
||||
const sayisopacity = ref(false)
|
||||
//第几套表格
|
||||
const currentNumber = ref(0);
|
||||
const scrollKey = ref(0);
|
||||
|
||||
const saveleft = ref(6);
|
||||
const saveright = ref(11);
|
||||
|
|
@ -896,7 +806,6 @@
|
|||
} else {
|
||||
return "right-top"
|
||||
}
|
||||
|
||||
})
|
||||
// 这是二级菜单的动画的模板
|
||||
const secondtemp = ref([])
|
||||
|
|
@ -912,8 +821,6 @@
|
|||
})
|
||||
})
|
||||
secondtemp.value = goodArray
|
||||
|
||||
|
||||
})
|
||||
// 上次点击时间
|
||||
const lastTap = ref(0)
|
||||
|
|
@ -982,7 +889,6 @@
|
|||
monthIndex.value = -1;
|
||||
weekValue.value = "";
|
||||
monthValue.value = "";
|
||||
|
||||
secondtop.value = 1
|
||||
firsttop.value = 1
|
||||
//这个东西完全是为了给动画用的,因为downmenuIndex这个吊东西其他地方在用,所以需要再整一个属性。
|
||||
|
|
@ -1240,7 +1146,6 @@
|
|||
// 初始化下面侧单列表 ---这是一级菜单的模版
|
||||
const doctorsayList = ref([
|
||||
{
|
||||
|
||||
url: genPaths(
|
||||
'/static/index/newruler',
|
||||
'daily_',
|
||||
|
|
@ -1421,7 +1326,6 @@
|
|||
openY.value = Math.floor(res.top) + 180
|
||||
jiao.value[1] = false
|
||||
}
|
||||
// openY.value = Math.floor(res.top);
|
||||
await nextTick()
|
||||
isopen.value = true;
|
||||
showDetail.value[0] = index0;
|
||||
|
|
@ -1440,9 +1344,6 @@
|
|||
const shakyTable = ref(false);
|
||||
const reldata = ref([]);
|
||||
//表格长按开始
|
||||
const rulerTouchStart = (item : any, index0 : number, index1 : number, e : any) => {
|
||||
|
||||
}
|
||||
const rulerTouchMove = (e : any) => {
|
||||
const moveXa = Math.floor(e.touches[0].pageX);
|
||||
const moveYa = Math.floor(e.touches[0].pageY);
|
||||
|
|
@ -1549,7 +1450,6 @@
|
|||
const openOp = ref(0);
|
||||
const clickOp = (index : number, item : any) => {
|
||||
saveId.value = item.id;
|
||||
// saveTagName.value = item.tagName
|
||||
cardsumit.value.op.index[2] = index
|
||||
cardsumit.value.op.name = item.relName
|
||||
switch (item.cycleType) {
|
||||
|
|
@ -1569,31 +1469,6 @@
|
|||
}
|
||||
|
||||
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 scrollContainer = ref(null)
|
||||
const opensay = () => {
|
||||
sayisopacity.value = false;
|
||||
|
|
@ -1647,12 +1522,10 @@
|
|||
isMove.value = false;
|
||||
let stopIt = false;
|
||||
let allobject = bigArray.value[upmenuIndex.value].children[downmenuIndex.value].children[thirdmenuIndex.value]
|
||||
// console.log("AAAAAA", allobject.cycleType)
|
||||
if (allobject.cycleType === "即时护理") {
|
||||
// console.log("zzzzz")
|
||||
scrollLeft.value = 1;
|
||||
bottomItems.value.forEach((element : any, index : number) => {
|
||||
if (element.id === allobject.id) {
|
||||
if (element.directiveName === allobject.title) {
|
||||
stopIt = true
|
||||
}
|
||||
})
|
||||
|
|
@ -1667,8 +1540,8 @@
|
|||
pushValue.directiveId = allobject.id;
|
||||
pushValue.directiveName = allobject.title;
|
||||
pushValue.target = `#03a4ff`
|
||||
pushValue.id = ""
|
||||
bottomItems.value.unshift(pushValue)
|
||||
// console.log("??????",bottomItems.value)
|
||||
// 实现即时指令动画
|
||||
cleansettimeout.value = setTimeout(() => {
|
||||
bottomItems.value[0].target = `#fff`;
|
||||
|
|
@ -1682,7 +1555,6 @@
|
|||
saveAll()
|
||||
}, 1500)
|
||||
}
|
||||
|
||||
})
|
||||
return
|
||||
}
|
||||
|
|
@ -1726,28 +1598,6 @@
|
|||
const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
|
||||
timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].startTime = formattedStart
|
||||
timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].endTime = formattedEnd
|
||||
// const moBan = ref({
|
||||
// directiveId: "",
|
||||
// directiveName: "",
|
||||
// typeId:"",
|
||||
// typeName:"",
|
||||
// categoryId:"",
|
||||
// categoryName:"",
|
||||
// cycleTypeId:"",
|
||||
// cycleType:"",
|
||||
// cycleValue:"",
|
||||
// startTime: "",
|
||||
// endTime: "",
|
||||
// positioning: "",
|
||||
// positioningLong: "",
|
||||
// izPackage:false,
|
||||
// previewFile:"",
|
||||
// previewFileSmall:"",
|
||||
// immediateFile:"",
|
||||
// immediateFileFocus:"",
|
||||
// tagName: "",
|
||||
// })
|
||||
// console.log("))))",allobject.cycleTypeId)
|
||||
let param = {
|
||||
directiveId: allobject.id,
|
||||
directiveName: allobject.title,
|
||||
|
|
@ -1779,29 +1629,19 @@
|
|||
}
|
||||
whereEvent(data);
|
||||
saveAll()
|
||||
|
||||
}
|
||||
const cleansettimeout = ref(null);
|
||||
const cleansettimeoutrel = ref(null);
|
||||
const saveAll = () => {
|
||||
if(!cansumit.value){
|
||||
if (!cansumit.value) {
|
||||
return
|
||||
}
|
||||
//给后端编译一下
|
||||
let postArray = [];
|
||||
timearr.value.forEach((element0, index0) => {
|
||||
element0.children.forEach((element1, index1) => {
|
||||
let savetagName = ""
|
||||
if (!element1.directiveName && !element1.id) {
|
||||
// let array = {};
|
||||
// if (element1.tagName) {
|
||||
// savetagName = element1.tagName
|
||||
// }
|
||||
// array = JSON.parse(JSON.stringify(moBan.value))
|
||||
// savetagName ? array.tagName = savetagName : ""
|
||||
// array.positioning = index0
|
||||
// array.positioningLong = index1
|
||||
// postArray.push(array)
|
||||
|
||||
} else {
|
||||
element1.positioning = index0;
|
||||
element1.positioningLong = index1;
|
||||
|
|
@ -1810,8 +1650,6 @@
|
|||
|
||||
})
|
||||
})
|
||||
// console.log("00000", postArray);
|
||||
// console.log("111111",bottomItems.value)
|
||||
let info = []
|
||||
|
||||
bodyTagList.value.forEach((element : any) => {
|
||||
|
|
@ -1824,13 +1662,11 @@
|
|||
info.push(element)
|
||||
}
|
||||
})
|
||||
|
||||
bottomItems.value.forEach((element:any,index:number)=>{
|
||||
|
||||
bottomItems.value.forEach((element : any, index : number) => {
|
||||
element.sort = index
|
||||
})
|
||||
// console.log("bottomItems",bottomItems.value)
|
||||
// console.log("22222",info)
|
||||
// console.log("cccc",uni.getStorageSync('NUall').elderInfo.name)
|
||||
|
||||
let allvalue = {
|
||||
nuId: uni.getStorageSync('nuId'),
|
||||
nuName: uni.getStorageSync('nuName'),
|
||||
|
|
@ -1840,18 +1676,10 @@
|
|||
instantList: bottomItems.value,
|
||||
tagList: info
|
||||
}
|
||||
// console.log("提交的", allvalue)
|
||||
|
||||
addBatch(allvalue).then(() => {
|
||||
|
||||
geteverything()
|
||||
// getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('customerId')).then((res : any) => {
|
||||
// if (res.success) {
|
||||
// console.log("new", res.result)
|
||||
// timearr.value = res.result
|
||||
// }
|
||||
|
||||
// })
|
||||
|
||||
addBatch(allvalue).then(() => {
|
||||
geteverything()
|
||||
})
|
||||
}
|
||||
const routerPush = () => {
|
||||
|
|
@ -1913,7 +1741,6 @@
|
|||
onShow(() => {
|
||||
|
||||
getServiceTree().then((res : any) => {
|
||||
// console.log("?????",res)
|
||||
res.result.forEach((element : any) => {
|
||||
if (element.netFlag == '0') {
|
||||
doctorsayList.value.forEach((res : any) => {
|
||||
|
|
@ -1938,7 +1765,6 @@
|
|||
})
|
||||
})
|
||||
bigArray.value = res.result;
|
||||
// console.log("((((()))))", bigArray.value)
|
||||
downList.value = bigArray.value[0].children
|
||||
upmenuIndex.value = -1;
|
||||
downdonghua.value = -1;
|
||||
|
|
@ -1948,59 +1774,34 @@
|
|||
}, 50)
|
||||
geteverything()
|
||||
})
|
||||
|
||||
|
||||
uni.$on('where', findback);
|
||||
})
|
||||
|
||||
|
||||
const bodyTagListLook = ref([]);
|
||||
const emotionTagListLook = ref([]);
|
||||
const cansumit = ref(false);
|
||||
const geteverything = () => {
|
||||
if (uni.getStorageSync('nuId') && uni.getStorageSync('customerId')) {
|
||||
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('customerId')).then((res : any) => {
|
||||
|
||||
// console.log("返回的",res.result)
|
||||
res.result.serviceList.forEach((res:any)=>{
|
||||
res.result.serviceList.forEach((res : any) => {
|
||||
timearr.value[res.positioning].children[res.positioningLong] = res;
|
||||
})
|
||||
//为了动画
|
||||
|
||||
// if(cansumit.value){
|
||||
// setTimeout(()=>{
|
||||
// bottomItems.value = res.result.instantList
|
||||
// },1500)
|
||||
// }else{
|
||||
// bottomItems.value = res.result.instantList
|
||||
// }
|
||||
bottomItems.value = res.result.instantList
|
||||
cansumit.value = true;
|
||||
emotionTagList.value = res.result.emotionTagList;
|
||||
emotionTagListLook.value = []
|
||||
bodyTagListLook.value = []
|
||||
// console.log("@@@@@",res.result.emotionTagList)
|
||||
res.result.emotionTagList.forEach((res:any)=>{
|
||||
if(res.izSelected=='1'){
|
||||
res.result.emotionTagList.forEach((res : any) => {
|
||||
if (res.izSelected == '1') {
|
||||
emotionTagListLook.value.push(res.netPic)
|
||||
}
|
||||
})
|
||||
bodyTagList.value = res.result.bodyTagList
|
||||
res.result.bodyTagList.forEach((res:any)=>{
|
||||
if(res.izSelected=='1'){
|
||||
res.result.bodyTagList.forEach((res : any) => {
|
||||
if (res.izSelected == '1') {
|
||||
bodyTagListLook.value.push(res.netPic)
|
||||
}
|
||||
})
|
||||
// res.result.emotionTagList.forEach((element:any)=>{
|
||||
// if(element.izSelected=='1'){
|
||||
// bodyTagListLook.value.push(element.netPic)
|
||||
// }
|
||||
// })
|
||||
// bodyTagList.value = res.result.bodyTagList
|
||||
// res.result.emotionTagList.forEach((element:any)=>{
|
||||
// if(element.izSelected=='1'){
|
||||
// emotionTagListLook.value.push(element.netPic)
|
||||
// }
|
||||
// })
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -2011,18 +1812,12 @@
|
|||
solveWatch.value = 3;
|
||||
whereEvent(data)
|
||||
}
|
||||
// defineExpose({
|
||||
// rulerMoveEnd,
|
||||
// })
|
||||
|
||||
const moveNumber = ref({
|
||||
index0: 999,
|
||||
index1: 999
|
||||
})
|
||||
// tagName: "",
|
||||
// nuId: uni.getStorageSync('nuId'),
|
||||
// customerId: uni.getStorageSync('customerId'),
|
||||
// id: "",
|
||||
|
||||
const moBan = ref({
|
||||
directiveId: "",
|
||||
directiveName: "",
|
||||
|
|
@ -2040,7 +1835,7 @@
|
|||
izPackage: '0',
|
||||
previewFile: "",
|
||||
previewFileSmall: "",
|
||||
serviceDuration:"",
|
||||
serviceDuration: "",
|
||||
immediateFile: "",
|
||||
immediateFileFocus: "",
|
||||
netImmediateFile: "",
|
||||
|
|
|
|||
|
|
@ -48,7 +48,9 @@
|
|||
duration: 1500
|
||||
})
|
||||
}
|
||||
console.log("声音开没开",e.onVolumeChange)
|
||||
if (this.suo && e.onVolumeChange) {
|
||||
console.log("声音被干掉了",e.onVolumeChange)
|
||||
if (e.onVolumeChange) {
|
||||
this.toggleVolume();
|
||||
}
|
||||
|
|
@ -59,11 +61,11 @@
|
|||
uni.setStorageSync('saveinit', 5);
|
||||
// this.doStopRecord()
|
||||
uni.$on('monitor:changeinit', (number) => {
|
||||
// this.initnumber = number;
|
||||
// this.$refs.monitor.killView
|
||||
this.$refs.monitor.initAutoPlay(number)
|
||||
uni.setStorageSync('saveinit', number);
|
||||
console.log("saveinit",number)
|
||||
// suo这个玩意是控制声音关闭的锁
|
||||
this.suo = true;
|
||||
}
|
||||
);
|
||||
uni.$on('monitor:isshow', (bool) => this.isshow = bool);
|
||||
|
|
@ -613,6 +615,5 @@
|
|||
height: 520px;
|
||||
border-radius: 30px;
|
||||
overflow: hidden;
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
@ -378,10 +378,10 @@
|
|||
wheretarget.value = index;
|
||||
if (index === 3) {
|
||||
uni.$emit('fullmonitor:flipImage', 6)
|
||||
removeIndexOnce(9)
|
||||
removeIndexOnce(8)
|
||||
} else {
|
||||
uni.$emit('fullmonitor:flipImage', index)
|
||||
cameratarget.value.push(9)
|
||||
cameratarget.value.push(8)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -713,7 +713,7 @@
|
|||
uni.setStorageSync('nuName', filteredMenu.value[savetypeNow.value].nuName);
|
||||
uni.setStorageSync('customerId', filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
|
||||
uni.setStorageSync('NUall', filteredMenu.value[savetypeNow.value]);
|
||||
// console.log("??????1111",filteredMenu.value[savetypeNow.value])
|
||||
console.log("??????1111",filteredMenu.value[savetypeNow.value])
|
||||
if (!typeNow.value) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/NursingNew/index'
|
||||
|
|
@ -1105,7 +1105,7 @@
|
|||
// console.log("!!!!!!!!!",menuIndex.value,leftTargetIndex.value)
|
||||
queryPadPageList().then((res => {
|
||||
leftMenuArray.value = res.result.records;
|
||||
// console.log("????", leftMenuArray.value)
|
||||
console.log("queryPadPageList", leftMenuArray.value)
|
||||
leftMenuArray.value.forEach((res : any) => {
|
||||
switch (res.areaFlag) {
|
||||
case '1':
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 425 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 781 KiB |
|
|
@ -44,7 +44,9 @@ const _sfc_main = {
|
|||
duration: 1500
|
||||
});
|
||||
}
|
||||
formatAppLog("log", "at pages/camera.nvue:51", "声音开没开", e.onVolumeChange);
|
||||
if (this.suo && e.onVolumeChange) {
|
||||
formatAppLog("log", "at pages/camera.nvue:53", "声音被干掉了", e.onVolumeChange);
|
||||
if (e.onVolumeChange) {
|
||||
this.toggleVolume();
|
||||
}
|
||||
|
|
@ -59,6 +61,7 @@ const _sfc_main = {
|
|||
this.$refs.monitor.initAutoPlay(number);
|
||||
uni.setStorageSync("saveinit", number);
|
||||
formatAppLog("log", "at pages/camera.nvue:66", "saveinit", number);
|
||||
this.suo = true;
|
||||
}
|
||||
);
|
||||
uni.$on("monitor:isshow", (bool) => this.isshow = bool);
|
||||
|
|
@ -98,30 +101,30 @@ const _sfc_main = {
|
|||
methods: {
|
||||
/* ------------------ 原有功能 ------------------ */
|
||||
handleTelEvent(event) {
|
||||
formatAppLog("log", "at pages/camera.nvue:110", "Tel event detail:", event.detail);
|
||||
formatAppLog("log", "at pages/camera.nvue:112", "Tel event detail:", event.detail);
|
||||
},
|
||||
killView() {
|
||||
this.$refs.monitor.killView && this.$refs.monitor.killView();
|
||||
},
|
||||
switchDisplay(mode) {
|
||||
formatAppLog("log", "at pages/camera.nvue:118", "zzzzz", mode);
|
||||
formatAppLog("log", "at pages/camera.nvue:120", "zzzzz", mode);
|
||||
this.$refs.monitor && this.$refs.monitor.switchDisplayModeFragment(mode);
|
||||
},
|
||||
startAlarm() {
|
||||
this.isAlarming = true;
|
||||
this.$refs.monitor.startOrStopManualAlarm(this.isAlarming, (res) => {
|
||||
formatAppLog("log", "at pages/camera.nvue:125", "startAlarm callback:", res);
|
||||
formatAppLog("log", "at pages/camera.nvue:127", "startAlarm callback:", res);
|
||||
});
|
||||
},
|
||||
stopAlarm() {
|
||||
this.isAlarming = false;
|
||||
this.$refs.monitor.startOrStopManualAlarm(this.isAlarming, (res) => {
|
||||
formatAppLog("log", "at pages/camera.nvue:131", "stopAlarm callback:", res);
|
||||
formatAppLog("log", "at pages/camera.nvue:133", "stopAlarm callback:", res);
|
||||
});
|
||||
},
|
||||
flipImage(type) {
|
||||
this.$refs.monitor.changeImageSwitch(type, (res) => {
|
||||
formatAppLog("log", "at pages/camera.nvue:137", "flipImage callback:", res);
|
||||
formatAppLog("log", "at pages/camera.nvue:139", "flipImage callback:", res);
|
||||
});
|
||||
},
|
||||
resumeOrPause() {
|
||||
|
|
@ -158,7 +161,7 @@ const _sfc_main = {
|
|||
}
|
||||
try {
|
||||
this.$refs.monitor.snapShot((res) => {
|
||||
formatAppLog("log", "at pages/camera.nvue:183", "snapShot callback:", res);
|
||||
formatAppLog("log", "at pages/camera.nvue:185", "snapShot callback:", res);
|
||||
this._handleSnapshotResultFromNative(res, payload.reqId);
|
||||
});
|
||||
uni.showToast({
|
||||
|
|
@ -167,7 +170,7 @@ const _sfc_main = {
|
|||
duration: 800
|
||||
});
|
||||
} catch (err) {
|
||||
formatAppLog("error", "at pages/camera.nvue:192", "snapShot 调用失败", err);
|
||||
formatAppLog("error", "at pages/camera.nvue:194", "snapShot 调用失败", err);
|
||||
uni.showToast({
|
||||
title: "snapShot 调用失败",
|
||||
icon: "none"
|
||||
|
|
@ -199,7 +202,7 @@ const _sfc_main = {
|
|||
}
|
||||
try {
|
||||
this.$refs.monitor.startRecord((res) => {
|
||||
formatAppLog("log", "at pages/camera.nvue:225", "startRecord callback:", res);
|
||||
formatAppLog("log", "at pages/camera.nvue:227", "startRecord callback:", res);
|
||||
if (payload.reqId) {
|
||||
uni.$emit(`monitor:response:${payload.reqId}`, {
|
||||
ok: true,
|
||||
|
|
@ -213,7 +216,7 @@ const _sfc_main = {
|
|||
icon: "none"
|
||||
});
|
||||
} catch (err) {
|
||||
formatAppLog("error", "at pages/camera.nvue:240", "startRecord 调用失败", err);
|
||||
formatAppLog("error", "at pages/camera.nvue:242", "startRecord 调用失败", err);
|
||||
uni.showToast({
|
||||
title: "startRecord 调用失败",
|
||||
icon: "none"
|
||||
|
|
@ -248,11 +251,11 @@ const _sfc_main = {
|
|||
}
|
||||
try {
|
||||
this.$refs.monitor.stopRecord((res) => {
|
||||
formatAppLog("log", "at pages/camera.nvue:279", "stopRecord callback:", res);
|
||||
formatAppLog("log", "at pages/camera.nvue:281", "stopRecord callback:", res);
|
||||
this._handleRecordResultFromNative(res, payload.reqId);
|
||||
});
|
||||
} catch (err) {
|
||||
formatAppLog("error", "at pages/camera.nvue:284", "stopRecord 调用失败", err);
|
||||
formatAppLog("error", "at pages/camera.nvue:286", "stopRecord 调用失败", err);
|
||||
uni.showToast({
|
||||
title: "stopRecord 调用失败",
|
||||
icon: "none"
|
||||
|
|
@ -287,7 +290,7 @@ const _sfc_main = {
|
|||
}
|
||||
try {
|
||||
this.$refs.monitor.openTalk((res) => {
|
||||
formatAppLog("log", "at pages/camera.nvue:321", "openTalk callback:", res);
|
||||
formatAppLog("log", "at pages/camera.nvue:323", "openTalk callback:", res);
|
||||
if (payload.reqId) {
|
||||
uni.$emit(`monitor:response:${payload.reqId}`, {
|
||||
ok: true,
|
||||
|
|
@ -301,7 +304,7 @@ const _sfc_main = {
|
|||
icon: "none"
|
||||
});
|
||||
} catch (err) {
|
||||
formatAppLog("error", "at pages/camera.nvue:336", "openTalk 调用失败", err);
|
||||
formatAppLog("error", "at pages/camera.nvue:338", "openTalk 调用失败", err);
|
||||
uni.showToast({
|
||||
title: "openTalk 调用失败",
|
||||
icon: "none"
|
||||
|
|
@ -333,7 +336,7 @@ const _sfc_main = {
|
|||
}
|
||||
try {
|
||||
this.$refs.monitor.stopTalk((res) => {
|
||||
formatAppLog("log", "at pages/camera.nvue:369", "stopTalk callback:", res);
|
||||
formatAppLog("log", "at pages/camera.nvue:371", "stopTalk callback:", res);
|
||||
if (payload.reqId) {
|
||||
uni.$emit(`monitor:response:${payload.reqId}`, {
|
||||
ok: true,
|
||||
|
|
@ -343,7 +346,7 @@ const _sfc_main = {
|
|||
});
|
||||
this.isTalking = false;
|
||||
} catch (err) {
|
||||
formatAppLog("error", "at pages/camera.nvue:379", "stopTalk 调用失败", err);
|
||||
formatAppLog("error", "at pages/camera.nvue:381", "stopTalk 调用失败", err);
|
||||
uni.showToast({
|
||||
title: "stopTalk 调用失败",
|
||||
icon: "none"
|
||||
|
|
@ -361,19 +364,19 @@ const _sfc_main = {
|
|||
// 处理来自模板 @onSnapShot 的事件(event.detail)
|
||||
handleSnapShotEvent(event) {
|
||||
const payload = event && event.detail ? event.detail : event;
|
||||
formatAppLog("log", "at pages/camera.nvue:399", "onSnapShot event:", payload);
|
||||
formatAppLog("log", "at pages/camera.nvue:401", "onSnapShot event:", payload);
|
||||
this._handleSnapshotResultFromNative(payload);
|
||||
},
|
||||
// 处理来自模板 @onRecord 的事件(event.detail)
|
||||
handleRecordEvent(event) {
|
||||
const payload = event && event.detail ? event.detail : event;
|
||||
formatAppLog("log", "at pages/camera.nvue:407", "onRecord event:", payload);
|
||||
formatAppLog("log", "at pages/camera.nvue:409", "onRecord event:", payload);
|
||||
this._handleRecordResultFromNative(payload);
|
||||
},
|
||||
// 处理来自模板 @onTalkStatus 的事件
|
||||
handleTalkEvent(event) {
|
||||
const payload = event && event.detail ? event.detail : event;
|
||||
formatAppLog("log", "at pages/camera.nvue:414", "onTalkStatus event:", payload);
|
||||
formatAppLog("log", "at pages/camera.nvue:416", "onTalkStatus event:", payload);
|
||||
const status = payload && payload.talkStatus;
|
||||
const tips = payload && payload.tips;
|
||||
uni.$emit("monitor:talk:status", payload);
|
||||
|
|
@ -441,7 +444,7 @@ const _sfc_main = {
|
|||
let payload = res;
|
||||
if (res.detail)
|
||||
payload = res.detail;
|
||||
formatAppLog("log", "at pages/camera.nvue:491", "snapshot payload normalized:", payload);
|
||||
formatAppLog("log", "at pages/camera.nvue:493", "snapshot payload normalized:", payload);
|
||||
if (reqIdFromCallback) {
|
||||
uni.$emit(`monitor:response:${reqIdFromCallback}`, {
|
||||
ok: !!payload.snapShotResult,
|
||||
|
|
@ -477,7 +480,7 @@ const _sfc_main = {
|
|||
icon: "none",
|
||||
duration: 2e3
|
||||
});
|
||||
formatAppLog("warn", "at pages/camera.nvue:534", "snapshot failed reason:", err, payload);
|
||||
formatAppLog("warn", "at pages/camera.nvue:536", "snapshot failed reason:", err, payload);
|
||||
}
|
||||
},
|
||||
_handleRecordResultFromNative(res, reqIdFromCallback = null) {
|
||||
|
|
@ -498,7 +501,7 @@ const _sfc_main = {
|
|||
let payload = res;
|
||||
if (res.detail)
|
||||
payload = res.detail;
|
||||
formatAppLog("log", "at pages/camera.nvue:556", "record payload normalized:", payload);
|
||||
formatAppLog("log", "at pages/camera.nvue:558", "record payload normalized:", payload);
|
||||
if (reqIdFromCallback) {
|
||||
uni.$emit(`monitor:response:${reqIdFromCallback}`, {
|
||||
ok: !!(payload.recordUrl || payload.snapShotResult),
|
||||
|
|
@ -522,7 +525,7 @@ const _sfc_main = {
|
|||
duration: 1400
|
||||
});
|
||||
this.isRecording = false;
|
||||
formatAppLog("log", "at pages/camera.nvue:587", "录屏地址:", payload.recordUrl);
|
||||
formatAppLog("log", "at pages/camera.nvue:589", "录屏地址:", payload.recordUrl);
|
||||
} else if (payload.recordFailedReason) {
|
||||
uni.showToast({
|
||||
title: "录屏失败: " + payload.recordFailedReason,
|
||||
|
|
@ -530,7 +533,7 @@ const _sfc_main = {
|
|||
duration: 2e3
|
||||
});
|
||||
this.isRecording = false;
|
||||
formatAppLog("warn", "at pages/camera.nvue:595", "record failed reason:", payload.recordFailedReason);
|
||||
formatAppLog("warn", "at pages/camera.nvue:597", "record failed reason:", payload.recordFailedReason);
|
||||
} else {
|
||||
if (payload.snapShotResult === true) {
|
||||
uni.showToast({
|
||||
|
|
|
|||
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
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
Loading…
Reference in New Issue