diff --git a/pages/NursingNew/component/api.js b/pages/NursingNew/component/api.js
index 6368586..2ee7e11 100644
--- a/pages/NursingNew/component/api.js
+++ b/pages/NursingNew/component/api.js
@@ -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'
+ })
}
\ No newline at end of file
diff --git a/pages/NursingNew/component/equipment.vue b/pages/NursingNew/component/equipment.vue
index 375c49e..7e8f6dd 100644
--- a/pages/NursingNew/component/equipment.vue
+++ b/pages/NursingNew/component/equipment.vue
@@ -1,7 +1,182 @@
-
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SN
+
+
+ 操作时间
+
+
+ {{ typeNow==1?`上次电表值`:`上次水表值` }}
+
+
+
+ {{ typeNow==1?`电表值`:`水表值` }}
+
+
+ 状态
+
+
+
+
+ {{ item.address }}
+
+
+ {{ item.requestTime }}
+
+
+ {{ Number(item.requestValue).toFixed(2) }}
+
+
+ {{ Number(item.resolveValue).toFixed(2) }}
+
+
+ {{ item.resolveStatus }}
+
+
+
+
+
+ 暂无信息
+
+
+
+
+
+
+ SN
+
+
+ 操作时间
+
+
+
+ 状态
+
+
+
+
+ {{ item.address }}
+
+
+ {{ item.requestTime }}
+
+
+ {{ item.resolveStatus }}
+
+
+
+
+
+ 暂无信息
+
+
+
+
+
+
+ sn
+
+
+ {{ rizhivalue.type == '0'? `抄表时间` : `告警时间` }}
+
+
+ {{ rizhivalue.type == '0'? `温度` : `告警内容` }}
+
+
+
+ {{ rizhivalue.type == '0'? `湿度` : `告警值` }}
+
+
+
+ {{ rizhivalue.type == '0'? `状态` : `消除告警时间` }}
+
+
+
+
+ {{ item.sn }}
+
+
+ {{ rizhivalue.type == '0'? item.optTime : item.wrDate }}
+
+
+ {{ rizhivalue.type == '0'? item.temperature : item.wrContent }}
+
+
+ {{ rizhivalue.type == '0'? item.humidity : item.wrData }}
+
+
+ {{ rizhivalue.type == '0'? (item.status=='0'?`抄表成功`:`抄表失败`) : item.clearDate }}
+
+
+
+
+
+ 暂无信息
+
+
+
+
@@ -69,9 +244,9 @@
- 23°C
+ {{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C
- 39%
+ {{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].humidity: '-' }}%
@@ -101,73 +276,7 @@
-
-
-
-
-
-
-
-
-
@@ -175,9 +284,7 @@
-
+
NUID:{{rightmessage.nuId?rightmessage.nuId:''}}
@@ -199,19 +306,7 @@
-
+
@@ -271,8 +364,8 @@
@@ -465,7 +557,8 @@
import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps, watch, onUnmounted } from 'vue';
import {
electricityMeterlist, electricityMetereleReset, electricityMetereleControl, electricityMeterbaoxiu, electricityMeteleRead,
- waterwaterReset, waterwaterControl, waterbaoxiu, waterwaterRead, humidDevicebaoxiu, updateDeviceRealTime,cameraInfobaoxiu
+ waterwaterReset, waterwaterControl, waterbaoxiu, waterwaterRead, humidDevicebaoxiu, updateDeviceRealTime, cameraInfobaoxiu,
+ electricityMeterListArray, requestLogList, humidDevicejgList, humidDevicejgwarn
} from "./api.js"
import { movedirection, queryPadPageList } from '@/pages/watch/api/lunpan.js'
import joysticknew from '@/component/public/newgame/joysticknew.vue';
@@ -498,359 +591,86 @@
...[...base].reverse() // 先拷贝一份再反转,避免修改原 base
])
+ const updown = ref([
+ {
+ url: '/static/index/newindex/leftmenu/up.png'
+ },
+ {
+ url: '/static/index/newindex/leftmenu/down.png'
+ },
+ ])
+ const dianrizhi = ref([
+ {
+ name: "抄表",
+ type: "3",
+ url: "/static/index/newindex/leftmenu/read1.png",
+ targeturl: "/static/index/newindex/leftmenu/read8.png"
+ },
+ {
+ name: "清零",
+ type: "9",
+ url: "/static/index/newindex/leftmenu/bezero.png",
+ targeturl: "/static/index/newindex/leftmenu/bezerotarget.png",
+ },
+ {
+ name: "电表拉闸",
+ type: "10",
+ url: "/static/index/newindex/rightmenu/closes0.png",
+ targeturl: "/static/index/newindex/rightmenu/closes11.png"
+ },
+ {
+ name: "电表合闸",
+ type: "11",
+ url: "/static/index/newindex/rightmenu/switch0.png",
+ targeturl: "/static/index/newindex/rightmenu/switch6.png"
+ },
+ ])
+
+ const shuirizhi = ref([
+ {
+ name: "抄表",
+ type: "42",
+ url: "/static/index/newindex/leftmenu/read1.png",
+ targeturl: "/static/index/newindex/leftmenu/read8.png"
+ },
+ {
+ name: "清零",
+ type: "49",
+ url: "/static/index/newindex/leftmenu/bezero.png",
+ targeturl: "/static/index/newindex/leftmenu/bezerotarget.png",
+ },
+ {
+ name: "开阀",
+ type: "43",
+ url: "/static/index/newindex/rightmenu/closes0.png",
+ targeturl: "/static/index/newindex/rightmenu/closes11.png"
+ },
+ {
+ name: "关阀",
+ type: "53",
+ url: "/static/index/newindex/rightmenu/switch0.png",
+ targeturl: "/static/index/newindex/rightmenu/switch6.png"
+ },
+ ])
+ const wenrizhi = ref([
+ {
+ name: "抄表",
+ type: "0",
+ url: "/static/index/newindex/leftmenu/read1.png",
+ targeturl: "/static/index/newindex/leftmenu/read8.png"
+ },
+ {
+ name: "告警",
+ type: "1",
+ url: "/static/index/newindex/rightmenu/service0.png",
+ targeturl: "/static/index/newindex/rightmenu/service4.png",
+ },
+
+ ])
// 绑定到 scroll-view 的 scroll-left
const scrollLeft = ref(0)
-
- // const downpicture = [
- // "原图",
- // "全景拉伸",
- // "四分屏",
- // "180°全景",
- // "360°全景"
- // ]
- // const bottomTargetIndex = ref(-1);
- // const downtarget = ref(-1);
- // const second = ref(0);
- // const cameraArray = ref([
- // "截图",
- // "录制",
- // "对讲",
- // "静音",
- // "预警",
- // // "返回",
- // "图片",
- // "视频",
- // "清晰度",
- // "翻转",
- // ])
- // const cameratarget = ref([]);
- // const wheelRef = ref(null);
- // const movecamera = (type : number) => {
- // handleKey(type)
- // }
- // // 对 moveFirstUp / moveFirstDown 包装防抖
- // const moveUpDebounced = useThrottle(() => wheelRef.value?.moveFirstUp(), 400)
- // const moveDownDebounced = useThrottle(() => wheelRef.value?.moveFirstDown(), 400)
- // const moveUpsecond = useThrottle(() => wheelRef.value?.moveSecondUp(), 400)
- // const moveDownsecond = useThrottle(() => wheelRef.value?.moveSecondDown(), 400)
- // const clickDownsecond = useThrottle(() => doSomething(), 700)
- // function doSomething() {
- // wheelRef.value?.startchange()
-
- // if (first.value === 0) {
- // if (second.value) {
- // uni.$emit('smallmonitor:toggleVolume');
- // } else {
- // uni.$emit('smallmonitor:toggleVolume');
- // }
- // }
- // if (first.value === 1) {
- // if (second.value) {
- // uni.$emit('smallmonitor:stopTalk');
- // } else {
- // uni.$emit('smallmonitor:openTalk');
- // }
- // }
- // if (first.value === 2) {
- // uni.$emit('smallmonitor:doSnapshot');
- // }
- // if (first.value === 3) {
- // if (second.value) {
- // uni.$emit('smallmonitor:stopRecord');
- // } else {
- // uni.$emit('smallmonitor:startRecord');
- // }
- // }
- // if (first.value === 4) {
- // if (!second.value) {
- // savefirst.value = first.value
- // first.value = -1;
- // yuntai.value = true;
- // } else {
-
- // }
-
- // }
- // if (first.value === 5) {
- // if (gaoqing.value !== second.value) {
- // gaoqing.value = second.value
- // uni.$emit('smallmonitor:changeQuality'); // 发起截图请求,不关心回调
- // }
- // }
- // if (first.value === 6) {
- // uni.$emit('smallmonitor:switchDisplay', second.value)
- // }
- // if (first.value === 7) {
- // if (second.value === 3) {
- // uni.$emit('smallmonitor:flipImage', 6)
- // } else {
- // uni.$emit('smallmonitor:flipImage', second.value)
- // }
-
- // }
- // if (first.value === 8) {
- // if (second.value) {
- // uni.$emit('smallmonitor:stopAlarm')
- // } else {
- // uni.$emit('smallmonitor:startAlarm')
- // }
-
- // }
- // }
- // function useThrottle(fn : () => void, delay = 1000) {
- // let throttling = false
- // return () => {
- // if (throttling) return
- // fn()
- // throttling = true
- // setTimeout(() => {
- // throttling = false
- // }, delay)
- // }
- // }
- // const gaoqing = ref(0);
- // const yuntai = ref(false);
- // const savefirst = ref(-1);
- // const first = ref(5);
- // // 核心逻辑
- // function handleKey(type : number) {
- // switch (type) {
- // case 0: runDirection(1, 0); break // 上
- // case 1: runDirection(5, 1); break // 右
- // case 2: runDirection(7, 2); break // 下
- // case 3: runDirection(3, 3); break // 左
- // case 4: // 确定
- // first.value = savefirst.value
- // yuntai.value = false
- // savefirst.value = -1
- // moveUpsecond()
- // clickDownsecond()
- // break
- // case 5: // 取消
- // first.value = savefirst.value
- // yuntai.value = false
- // savefirst.value = -1
- // moveUpsecond()
- // clickDownsecond()
- // break
- // }
- // }
- // // 当前活跃的方向(0,1,2,3)
- // // -1 表示没有活跃方向
- // let activeDir = -1
- // // 定时器 map,key = 方向
- // const stopTimers : Record = {}
- // // 管理方向的开始/停止
- // function runDirection(dirCode : number, type : number) {
- // // 如果换方向,先停掉旧的
- // if (activeDir !== -1 && activeDir !== type) {
- // stopDirection(activeDir)
- // }
-
- // activeDir = type
-
- // // 执行开始
- // movedirection(dirCode, 1)
-
- // // 重置 stop 计时器
- // if (stopTimers[type]) clearTimeout(stopTimers[type])
-
- // stopTimers[type] = setTimeout(() => {
- // stopDirection(type)
- // }, 550) // 如果 550ms 内没有新指令 → 自动停止
- // }
-
- // // 停止动作
- // function stopDirection(type : number) {
- // if (type === -1) return
- // let dirCode = 0
- // switch (type) {
- // case 0: dirCode = 1; break
- // case 1: dirCode = 5; break
- // case 2: dirCode = 7; break
- // case 3: dirCode = 3; break
- // }
- // movedirection(dirCode, 0).then((res : any) => { })
-
- // clearTimeout(stopTimers[type])
- // stopTimers[type] = null
- // if (activeDir === type) activeDir = -1
- // }
-
- // // 简单的宽松解析函数
- // function parseDateFlexible(s) {
- // if (s instanceof Date) return s
- // if (typeof s !== 'string') throw new Error('birth must be string or Date')
- // // 支持 "YYYY-MM-DD" 或 "YYYY年MM月DD日" 或 "YYYY/MM/DD"
- // const m = s.match(/(\d{4})\D+(\d{1,2})\D+(\d{1,2})/)
- // if (!m) throw new Error('无法解析的日期格式')
- // return new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]))
- // }
- // const removeIndexOnce = (index : number) => {
- // const pos = cameratarget.value.indexOf(index)
- // if (pos !== -1) {
- // cameratarget.value.splice(pos, 1) // 从 pos 开始删除 1 个元素
- // }
- // }
- // const wheretarget = ref(3);
- // const where = [
- // {
- // name: "左右翻转",
- // url: "/static/index/camera/800.png",
- // target: "/static/index/camera/801.png",
- // },
- // {
- // name: "上下翻转",
- // url: "/static/index/camera/810.png",
- // target: "/static/index/camera/811.png",
- // },
- // {
- // name: "中心翻转",
- // url: "/static/index/camera/820.png",
- // target: "/static/index/camera/821.png",
- // },
- // {
- // name: "不翻转",
- // url: "/static/index/camera/830.png",
- // target: "/static/index/camera/831.png",
- // },
- // ]
- // const jumpopen = ref(false);
- // const rightjumpopen = ref(false);
- // const clickcamera = (index : number) => {
- // switch (index) {
- // case 0:
- // // 触发快照事件
- // uni.$emit('smallmonitor:doSnapshot')
-
- // // 如果数组里不存在就 push(避免重复)
- // if (!cameratarget.value.includes(index)) {
- // cameratarget.value.push(index)
- // }
-
- // // 如果之前有定时器,先清掉(实现“重新计时”)
- // if (removeTimers.has(index)) {
- // clearTimeout(removeTimers.get(index)!)
- // }
-
- // // 新建一个 1s 后移除的定时器
- // const timerId = setTimeout(() => {
- // const pos = cameratarget.value.indexOf(index)
- // if (pos !== -1) {
- // cameratarget.value.splice(pos, 1)
- // }
- // removeTimers.delete(index)
- // }, 500)
-
- // removeTimers.set(index, timerId)
- // break
- // case 1:
- // if (cameratarget.value.includes(index)) {
- // uni.$emit('smallmonitor:stopRecord');
- // removeIndexOnce(index)
- // } else {
- // uni.$emit('smallmonitor:startRecord');
- // cameratarget.value.push(index)
- // }
- // break
- // case 2:
- // if (cameratarget.value.includes(index)) {
- // uni.$emit('smallmonitor:stopTalk');
- // removeIndexOnce(index)
- // } else {
- // uni.$emit('smallmonitor:openTalk');
- // cameratarget.value.push(index)
- // }
- // break
- // case 3:
- // if (cameratarget.value.includes(index)) {
- // uni.$emit('smallmonitor:toggleVolume');
- // removeIndexOnce(index)
- // } else {
- // uni.$emit('smallmonitor:toggleVolume');
- // cameratarget.value.push(index)
- // }
- // break
- // case 4:
- // if (cameratarget.value.includes(index)) {
- // uni.$emit('smallmonitor:stopAlarm')
- // removeIndexOnce(index)
- // } else {
- // uni.$emit('smallmonitor:startAlarm')
- // cameratarget.value.push(index)
- // }
- // break
- // // case 5:
-
- // // jumpopen.value = false;
- // // uni.navigateBack()
- // // break
- // case 5:
- // if (cameratarget.value.includes(index)) {
- // removeIndexOnce(index)
- // } else {
- // cameratarget.value.push(index)
- // }
- // break
- // case 6:
- // if (cameratarget.value.includes(index)) {
- // removeIndexOnce(index)
- // } else {
- // cameratarget.value.push(index)
- // }
- // break
- // case 7:
- // if (cameratarget.value.includes(index)) {
- // uni.$emit('smallmonitor:changeQuality');
- // removeIndexOnce(index)
- // } else {
- // uni.$emit('smallmonitor:changeQuality');
- // cameratarget.value.push(index)
- // }
- // break
- // case 8:
- // rightjumpopen.value = true
- // break
- // }
- // }
- // const clickjump = (index : number) => {
- // wheretarget.value = index;
- // if (index === 3) {
- // uni.$emit('smallmonitor:flipImage', 6)
- // removeIndexOnce(9)
- // } else {
- // uni.$emit('smallmonitor:flipImage', index)
- // cameratarget.value.push(9)
- // }
-
- // }
- // const clickDownCard = (index : number) => {
- // // cleanandopen()
- // bottomTargetIndex.value = index;
- // // clickDownCard(0)
- // downtarget.value = index;
- // switch (index) {
- // case 0:
- // uni.$emit('smallmonitor:switchDisplay', 0)
- // break
- // case 1:
- // uni.$emit('smallmonitor:switchDisplay', 4)
- // break
- // case 2:
- // uni.$emit('smallmonitor:switchDisplay', 1)
- // break
- // case 3:
- // uni.$emit('smallmonitor:switchDisplay', 2)
- // break
- // case 4:
- // uni.$emit('smallmonitor:switchDisplay', 3)
- // break
- // }
- // }
-
-
// 监听 isMain 的变化,但只在 isShow 为 true 时响应
watch(
() => props.isMain,
@@ -892,7 +712,63 @@
() => props.propsmove,
() => {
if (movetype.value != -1) {
+ if (openrizhi.value) {
+ switch (props.propsmove) {
+ case 0:
+
+ break;
+ case 1:
+ if (typeNow.value == 3) {
+ if (ruletarget.value < 4) {
+ ruletarget.value++
+ }
+ } else {
+ if (ruletarget.value < 6) {
+ ruletarget.value++
+ }
+ }
+ break;
+ case 2:
+
+
+ break;
+
+ case 3:
+ if (ruletarget.value) {
+ ruletarget.value--
+ }
+
+ break;
+ case 4:
+ if (typeNow.value == 1) {
+ if (ruletarget.value < 4) {
+ changetype(dianrizhi.value[ruletarget.value].type, ruletarget.value)
+ } else {
+ nextpage(ruletarget.value - dianrizhi.value.length)
+ }
+ } else if (typeNow.value == 2) {
+ if (ruletarget.value < 4) {
+ changetype(shuirizhi.value[ruletarget.value].type, ruletarget.value)
+ } else {
+ nextpage(ruletarget.value - shuirizhi.value.length)
+ }
+ }else if (typeNow.value == 3) {
+ if (ruletarget.value < 2) {
+ changetype(wenrizhi.value[ruletarget.value].type, ruletarget.value)
+ } else {
+ nextpage(ruletarget.value - wenrizhi.value.length)
+ }
+ }
+
+
+ break;
+ case 5:
+ closeall()
+ default:
+ }
+ return
+ }
if (openqingling.value || openlahzha.value || openbaoxiu.value || openhehzha.value || openchaobiao.value) {
switch (props.propsmove) {
case 0:
@@ -1028,9 +904,9 @@
break;
case 3:
- movetype.value = -1
- zeroIndex.value = -1
- emit("back")
+ // movetype.value = -1
+ // zeroIndex.value = -1
+ // emit("back")
break;
case 4:
@@ -1041,14 +917,19 @@
} else if (zeroIndex.value == 1) {
openchaobiao.value = true
emit("canback", true)
+ } else {
+
+ getrulevalue()
+ emit("canback", true)
}
} else {
if (!zeroIndex.value) {
openchaobiao.value = true;
emit("canback", true)
} else if (zeroIndex.value == 1) {
- // openchaobiao.value = true
- // emit("canback", true)
+
+ getrulevalue()
+ emit("canback", true)
}
}
break;
@@ -1135,7 +1016,169 @@
const openhehzha = ref(false);
const openbaoxiu = ref(false);
const openchaobiao = ref(false);
+ const openrizhi = ref(false);
+ const rizhivalue = ref({
+ pageNo: 1,
+ pageSize: 8,
+ cid: 0,
+ type: "",
+ sn: ""
+ })
+ const relrule = ref([]);
+ const getrulevalue = () => {
+ rizhivalue.value.pageNo = 1;
+ relrule.value = []
+ ruletarget.value = 0
+ if (typeNow.value == 1) {
+ rizhivalue.value.cid = indexmessage.value.cid;
+ rizhivalue.value.type = dianrizhi.value[0].type;
+ electricityMeterListArray(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records;
+ openrizhi.value = true
+ }
+ })
+ }
+ if (typeNow.value == 2) {
+ rizhivalue.value.cid = watermessage.value.cid;
+ rizhivalue.value.type = shuirizhi.value[0].type;
+ electricityMeterListArray(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records;
+ openrizhi.value = true
+ }
+ })
+ }
+ if (typeNow.value == 3) {
+ rizhivalue.value.sn = tempmessage.value.sn;
+ rizhivalue.value.type = '0';
+ ruletype.value = 3
+ humidDevicejgList(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ // console.log("aaaa",relrule.value)
+ openrizhi.value = true
+ }
+ })
+ }
+ }
+ const ruletarget = ref(0);
+ const ruletype = ref(0);
+ const changetype = (type : string, index : number) => {
+
+ if (rizhivalue.value.type != type) {
+
+ if (typeNow.value == 3) {
+
+ ruletarget.value = index
+ rizhivalue.value.pageNo = 1;
+ relrule.value = [];
+ rizhivalue.value.type = type;
+ if (type == '0') {
+ humidDevicejgList(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ }
+ })
+ } else {
+ humidDevicejgwarn(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ console.log("aaaa", relrule.value)
+ }
+ })
+ }
+ return
+ }
+
+ if (index > 1) {
+ ruletype.value = 1
+ } else {
+ ruletype.value = 0
+ }
+ ruletarget.value = index
+ rizhivalue.value.pageNo = 1;
+ relrule.value = [];
+ rizhivalue.value.type = type;
+ electricityMeterListArray(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ }
+ })
+ }
+ }
+ const nextpage = (index : number) => {
+
+ if (typeNow.value == 3) {
+ ruletarget.value = index + 2;
+ if (index) {
+ if (relrule.value.length == 8) {
+ rizhivalue.value.pageNo++
+
+ if (rizhivalue.value.type == '0') {
+ humidDevicejgList(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ }
+ })
+ } else {
+ humidDevicejgwarn(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ console.log("aaaa", relrule.value)
+ }
+ })
+ }
+ }
+
+ } else {
+ if (rizhivalue.value.pageNo > 1) {
+ rizhivalue.value.pageNo--
+ relrule.value = []
+ if (rizhivalue.value.type == '0') {
+ humidDevicejgList(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ }
+ })
+ } else {
+ humidDevicejgwarn(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ }
+ })
+ }
+ }
+ }
+ return
+ }
+
+
+ ruletarget.value = index + dianrizhi.value.length
+ if (index) {
+ if (relrule.value.length == 8) {
+ rizhivalue.value.pageNo++
+ electricityMeterListArray(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ }
+ })
+ }
+
+ } else {
+ if (rizhivalue.value.pageNo > 1) {
+ rizhivalue.value.pageNo--
+ relrule.value = []
+ electricityMeterListArray(rizhivalue.value).then((element : any) => {
+ if (element.code == 200) {
+ relrule.value = element.result.records
+ }
+ })
+ }
+ }
+
+ }
const qingling = () => {
closeall()
if (typeNow.value == 1) {
@@ -1287,7 +1330,7 @@
}, 4000)
})
- }else if (typeNow.value == 0) {
+ } else if (typeNow.value == 0) {
cameraInfobaoxiu(tempmessage.value.id).then((res : any) => {
uni.showToast({
title: res.message,
@@ -1311,7 +1354,9 @@
openbaoxiu.value = false;
openhehzha.value = false;
openchaobiao.value = false;
+ openrizhi.value = false;
buttonposition.value = false;
+
emit("canback", false)
}
@@ -1326,11 +1371,19 @@
} else if (index == 1) {
openchaobiao.value = true;
emit("canback", true)
+ } else if (index == 2) {
+ // openrizhi.value = true;
+ getrulevalue()
+ emit("canback", true)
}
} else {
if (!index) {
openchaobiao.value = true;
emit("canback", true)
+ } else if (index == 1) {
+ // openrizhi.value = true;
+ getrulevalue()
+ emit("canback", true)
}
}
@@ -1674,7 +1727,7 @@
});
const allArray = ref([]);
const yulan = () => {
- console.log("?????")
+ // console.log("?????")
setTimeout(() => {
typeNowtarget.value = 0
changeallmessage()
@@ -1684,11 +1737,11 @@
allArray.value = [];
// console.log("????", uni.getStorageSync('serverUrl'), uni.getStorageSync('nuId'))
electricityMeterlist().then((res : any) => {
- console.log("!!!", res.result)
+ // console.log("!!!", res.result)
if (res.result.cameraInfoEntityList.length && res.result.cameraInfoEntityList != null) {
res.result.cameraInfoEntityList.forEach((element : any, index : number) => {
element.typeNumber = 0
- element.lookName = "摄像头" + index;
+ element.lookName = "摄像头" + (index+1) ;
element.donghuapian = typeArray.value[0].url
allArray.value.push(element)
})
@@ -1696,7 +1749,7 @@
if (res.result.electricityMeterEntityList.length && res.result.electricityMeterEntityList != null) {
res.result.electricityMeterEntityList.forEach((element : any, index : number) => {
element.typeNumber = 1
- element.lookName = "电表" + index
+ element.lookName = "电表" + (index+1)
element.donghuapian = typeArray.value[1].url
allArray.value.push(element)
})
@@ -1704,7 +1757,7 @@
if (res.result.waterMeterEntityList.length && res.result.waterMeterEntityList != null) {
res.result.waterMeterEntityList.forEach((element : any, index : number) => {
element.typeNumber = 2
- element.lookName = "水表" + index
+ element.lookName = "水表" + (index+1)
element.donghuapian = typeArray.value[2].url
allArray.value.push(element)
})
@@ -1712,12 +1765,18 @@
if (res.result.humidDeviceEntityList.length && res.result.humidDeviceEntityList != null) {
res.result.humidDeviceEntityList.forEach((element : any, index : number) => {
element.typeNumber = 3
- element.lookName = "温度计" + index
+ element.lookName = "温度计" + (index+1)
element.donghuapian = typeArray.value[3].url
allArray.value.push(element)
})
}
-
+ // 重新刷新动画
+ let donghua = typeNowtarget.value;
+ typeNowtarget.value = -1;
+ setTimeout(()=>{
+ typeNowtarget.value = donghua
+ },500)
+
// rightmessage.value = res.result.cameraInfoEntityList[0]
// //温度计
// tempmessage.value = res.result.humidDeviceEntityList[0];
@@ -1737,7 +1796,6 @@
}
}
-
\ No newline at end of file
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 8bafc3a..59ad0a8 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -10,9 +10,9 @@
- 23°C
+ {{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C
- 39%
+ {{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].humidity: '-' }}%
@@ -586,11 +586,11 @@
})
const lanjie = ref(false);
const clean = () => {
- if(movetype.value==-1){
+ if (movetype.value == -1) {
lanjie.value = true;
emit("cleanmain")
}
-
+
}
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index fbd1f90..19c74ea 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -42,8 +42,7 @@
未选择
-
+
@@ -77,8 +76,7 @@
未选择
-
+
@@ -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">
-
即时指令
@@ -228,7 +224,10 @@
- {{item.directiveName}}
+
+ {{item.directiveName}}
+
@@ -337,7 +336,6 @@
不能重复添加相同的即时服务指令
-