Merge branch 'Teng' of http://47.115.223.229:8888/yangjun/hldy_app into Teng

component/public/exit.vue

@@ -53,7 +53,6 @@
 	}
 	const go = () => {
 		uni.setStorageSync('token', 1);
-		// plus.runtime.quit();
 		
 		uni.redirectTo({
 			url: '/pages/login/login'
@@ -97,25 +96,17 @@
 		background-color: #fff;
 		display: flex;
 		flex-direction: column;
-		// justify-content: center;
 		align-items: center;
-		
-		// background-image: url('https://www.focusnu.com/media/directive/index/whitepeople.png');
-		// // background-size: 100% auto;
-		// background-position: top center;
-		// background-repeat: no-repeat;
 		z-index: 1;
 		padding: 0 10%;
 	}
 
 	.button {
 		width: 47%;
-		// background: linear-gradient(to left, #00C9FF, #0076FF);
 		background-color: #ddf0ff;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		// color: #fff;
 		color: #007CFF;
 		border: 1rpx solid #007CFF;
 		font-size: 25rpx;

pages/NursingNew/component/api.js

@@ -0,0 +1,81 @@
+// 引入 request 文件
+import request from '@/request/guanli.js'
+
+// 所有信息查询
+export const electricityMeterlist = () => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/iot/common/list?nuId=${uni.getStorageSync('nuId')}`,
+		method: 'get'
+	})
+}
+
+// 智能电表设备信息清零
+export const electricityMetereleReset = (cid,address) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/iot/electricityMeter/eleReset?cid=${cid}&address=${address}`,
+		method: 'get'
+	})
+}
+
+// 智能电表设备拉闸合闸
+export const electricityMetereleControl = (cid,address,type) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/iot/electricityMeter/eleControl?cid=${cid}&address=${address}&type=${type}`,
+		method: 'get'
+	})
+}
+
+// 智能电表设备保修
+export const electricityMeterbaoxiu = (id) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/iot/electricityMeter/baoxiu`,
+		method: 'post',
+		data: {
+			id:id
+		},
+	})
+}
+
+// 智能电表设备抄表
+export const electricityMeteleRead = (cid,address) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/iot/electricityMeter/eleRead?cid=${cid}&address=${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 waterbaoxiu = (id) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/iot/water/baoxiu`,
+		method: 'post',
+		data: {
+			id:id
+		},
+	})
+}
+
+// 智能电表设备抄表
+export const waterwaterRead = (cid,address) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/iot/water/waterRead?cid=${cid}&address=${address}`,
+		method: 'get'
+	})
+}

pages/NursingNew/index.vue

@@ -64,7 +64,7 @@
 		<index :isShow="menuIndexshow" v-if="!menuIndex" :propsmove="propsmove" :isMain="isMain" @back="movecard(5)"  @cleanmain="movecard(1)" />
 		<!-- 设备页 -->
 		<equipment :isShow="menuIndexshowfifth" v-if="menuIndex==4" :propsmove="propsmove" :isMain="isMain"
-			@back="movecard(5)" @cleanmain="movecard(1)" />
+			@back="movecard(5)" @cleanmain="movecard(1)" @canback="canmoveit" />
 		<!-- 户嘱页 -->
 		<nurse :isold="isOld===2" :liang="indexNumber" :isshow="menuIndexshowsecond"
 			v-if="menuIndex==1&&isOld===2&&uni.getStorageSync('customerId')&&uni.getStorageSync('nuId')"

pages/watch/index.vue

@@ -1117,7 +1117,7 @@
 		// console.log("!!!!!!!!!",menuIndex.value,leftTargetIndex.value)
 		queryPadPageList().then((res => {
 			leftMenuArray.value = res.result.records;
-			console.log("????", leftMenuArray.value)
+			// console.log("????", leftMenuArray.value)
 			leftMenuArray.value.forEach((res : any) => {
 				switch (res.areaFlag) {
 					case '1':

unpackage/cache/wgt/__UNI__FB2D473/__uniappview.html

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>View</title>
-    <link rel="icon" href="data:,">
-    <link rel="stylesheet" href="app.css" />
-    <script>var __uniConfig = {"globalStyle":{},"darkmode":false}</script>
-    <script>
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script src="uni-app-view.umd.js"></script>
-    
-    
-    
-  </body>
-</html>

unpackage/cache/wgt/__UNI__FB2D473/app-config.js

@@ -1 +0,0 @@
-(function(){})();

unpackage/cache/wgt/__UNI__FB2D473/manifest.json

@@ -1 +0,0 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.6.3","code":163},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"google":{"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"],"packagename":"uni.UNIFB2D473","aliasname":"__uni__fb2d473","password":"Z4Urhm9jqwqMGoeQNpGzJA==","storepwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keypwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"plistcmds":["Add :UIFileSharingEnabled bool true"],"devices":"universal"},"plugins":{"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}},"share":{"weixin":{"UniversalLinks":"","appid":"wxda748470da82886e"}}},"debug":true,"syncDebug":true,"orientation":"portrait-primary"},"nativePlugins":{"MonitorModule":{}},"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"}},"adid":"122926210510"},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}

unpackage/cache/wgt/__UNI__FB2D473/nativeplugins/MonitorModule/package.json

@@ -1,39 +0,0 @@
-{
-	"name":"MonitorModule",
-	"id":"MonitorModule",
-	"version":"2.0.1",
-	"description":"bugly升级",
-	"_dp_type":"nativeplugin",
-	"_dp_nativeplugin":{
-		"android":{
-			"plugins":[{
-				"type":"module",
-				"name":"MonitorModule",
-				"class": "com.cn.plugin_module.MonitorModule"
-			},
-			{
-			    "type": "component",
-			    "name": "MonitorControlView",
-			    "class": "com.cn.plugin_module.PTZMotorJoyStickView"
-			},
-			{
-			     "type": "component",
-			     "name": "MonitorView",
-			     "class": "com.cn.plugin_module.MonitorView"
-		    }],
-			"integrateType": "aar",
-			"dependencies": [
-			    "androidx.constraintlayout:constraintlayout:2.1.4",
-			    "androidx.core:core-ktx:1.3.2",
-			    "androidx.appcompat:appcompat:1.1.0",
-				"com.google.android.material:material:1.6.1",
-				"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3",
-			    "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3",
-				"androidx.lifecycle:lifecycle-runtime-ktx:2.5.1",
-				"com.google.code.gson:gson:2.10.1",
-				"com.alibaba:fastjson:1.2.83"
-			]
-		}
-	}
-}
-

unpackage/cache/wgt/__UNI__FB2D473/pages/assess/index.css

@@ -1 +0,0 @@
-.calendar[data-v-0bf11501]{padding:16px}.header[data-v-0bf11501]{display:flex;flex-direction:column}.header-title[data-v-0bf11501]{display:flex;justify-content:space-between;align-items:center}.year-month[data-v-0bf11501]{font-size:18px;font-weight:700;margin-bottom:8px}.botton-father[data-v-0bf11501]{display:flex;margin-top:-.625rem}.click-button[data-v-0bf11501]{padding:.3125rem;width:3.75rem;font-size:.78125rem;height:1.25rem;margin-right:.3125rem;display:flex;justify-content:center;align-items:center;color:#fff;background-color:#888;border-radius:.3125rem}.weekdays[data-v-0bf11501]{display:flex;background-color:#e9e7fc;border-radius:.9375rem;padding:.3125rem}.weekday[data-v-0bf11501]{flex:1;text-align:center}.days[data-v-0bf11501]{display:flex;flex-wrap:wrap;padding:.3125rem}.day-cell[data-v-0bf11501]{width:2.29688rem;height:2.51563rem;text-align:center;padding-top:.25rem;padding-bottom:.25rem;box-sizing:border-box}.day-cell.prev-month .gregorian[data-v-0bf11501],.day-cell.next-month .gregorian[data-v-0bf11501]{color:#ccc}.day-cell.selected[data-v-0bf11501]{background-color:#0b98dc;border-radius:.3125rem}.day-cell.selected .gregorian[data-v-0bf11501],.day-cell.selected .lunar[data-v-0bf11501]{color:#fff}.gregorian[data-v-0bf11501]{font-size:14px}.lunar[data-v-0bf11501]{font-size:10px;color:#888}.backgroundContainer[data-v-65a124ce]{position:relative;width:100%;height:100vh;background-image:url(../../static/index/lightbgcnew.png);background-size:cover;background-position:center center;overflow:hidden}.assess-title[data-v-65a124ce]{margin-top:1.875rem;width:100%;height:1.875rem;display:flex;align-items:center;justify-content:space-between}.assess-title .right-icons[data-v-65a124ce]{display:flex;align-items:center;float:right;height:2.1875rem;margin-right:1.25rem}.assess-title .right-icons .right-icons-font[data-v-65a124ce]{margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-font-dark[data-v-65a124ce]{color:#fff;margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-img[data-v-65a124ce]{width:2.5rem;height:2.5rem;margin-left:.3125rem;margin-right:.3125rem;margin-top:-.625rem}.assess-title .right-icons .right-icons-img-icon[data-v-65a124ce]{width:1.875rem;height:2.5rem;margin-left:.25rem}.assess-title .left-icons[data-v-65a124ce]{display:flex;margin-left:1.25rem}.assess-title .left-icons .left-icons-img[data-v-65a124ce]{width:2.1875rem;height:2.1875rem}.assess-title .left-icons .right-icons-font[data-v-65a124ce]{font-weight:700;font-size:1.09375rem;margin-left:.3125rem;margin-top:.3125rem}.assess-title .left-icons .right-icons-text[data-v-65a124ce]{font-size:1.09375rem;margin-top:.3125rem}.assess-another[data-v-65a124ce]{width:100%;height:calc(100vh - 3.75rem);margin-top:.3125rem;display:flex;margin-left:1.5625rem}.assess-another .left-contain[data-v-65a124ce]{height:100%;width:18.75rem}.assess-another .left-contain .calendar[data-v-65a124ce]{width:100%;height:20.3125rem;background:linear-gradient(to top,#f4f3ff,#fff,#ecefff);border-radius:.78125rem}

unpackage/cache/wgt/__UNI__FB2D473/pages/denglu.css

@@ -1 +0,0 @@
-.content{display:flex;flex-direction:column;align-items:center;justify-content:center;width:100%;height:100vh}.logo{height:6.25rem;width:6.25rem;margin-top:6.25rem;margin-left:auto;margin-right:auto;margin-bottom:1.5625rem}.text-area{display:flex;justify-content:center}.title{font-size:1.125rem;color:#8f8f94}.typebutton{width:9.375rem;height:4.6875rem;display:flex;justify-content:center;align-items:center;margin-top:.9375rem;color:#fff}