From ce093a86cde7d8dce5ec2edc12e39be9fa11408e Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Thu, 10 Aug 2023 10:04:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20=E5=A2=9E=E5=8A=A0js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.xml          |  4 ++++
 pages/main.stml     | 10 +++++++++-
 pages/main/set.stml | 17 +++++++++--------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/config.xml b/config.xml
index dff5a67..97018a9 100644
--- a/config.xml
+++ b/config.xml
@@ -8,8 +8,12 @@
 
 	<preference name="avm" value="true"/>
 
+	<!-- <feature name="autoStartUp"/> -->
+
 	<preference name="pageBounce" value="false"/>
 
+	<preference name="softInputMode" value="resize"/>
+
 	<preference name="appBackground" value="rgba(0,0,0,0.0)"/>
 
 	<preference name="windowBackground" value="rgba(0,0,0,0.0)"/>
diff --git a/pages/main.stml b/pages/main.stml
index 7c9b46f..2190e97 100644
--- a/pages/main.stml
+++ b/pages/main.stml
@@ -1,6 +1,6 @@
 <template>
 	<view class="index_wrap">
-		<text class="index_title">运行状态</text>
+		<text class="index_title" @click="closeApp">运行状态</text>
 		<view class="index_list">
 			<view 
 				class="index_inline"
@@ -58,6 +58,13 @@ export default {
 		vm.initAll()
 	},
 	methods: {
+		closeApp(){
+			api.closeWidget({
+				id: api.appId,     //应用ID
+				retData: { name: 'closeWidget' },
+				silent: true
+			});
+		},
 		initAll(){
 			const vm = this
 			clearInterval(vm.data.jidianqiInte)
@@ -115,6 +122,7 @@ export default {
                         	dbUtils.execute(db, "INSERT INTO Sb (Id,sbId,circuitName,current,typeName,isTypeOpen) VALUES ('3','0D','3','3.21','低压风冷',1);", function(ret, err) {})
                         	dbUtils.execute(db, "INSERT INTO Sb (Id,sbId,circuitName,current,typeName,isTypeOpen) VALUES ('4','0E','4','3.21','闭锁调压',1);", function(ret, err) {})
 							console.log('创建设备表成功');
+							vm.initAll()
 						}
 					});
 				} else {
diff --git a/pages/main/set.stml b/pages/main/set.stml
index 9f29cc3..6cf78dd 100644
--- a/pages/main/set.stml
+++ b/pages/main/set.stml
@@ -14,10 +14,11 @@
 					</view>
 				</view> -->
 				<view class="inline_item">
-					<text class="item_label">电流通道：</text>
+					<text class="item_label">{{item.typeName}}：</text>
 					<view class="item_content">
-						<text class="item_label" @click="handleSelectChange(index,item)">{{item.circuitName}}路电流</text>
-						<input class="input" v-model="item.current" type="number" keyboard-type="decimal" confirm-type="done" :disabled="item.isTypeOpen==='0'" placeholder="请输入电流值" />
+						<text class="item_label">{{item.circuitName}}路电流</text>
+						<!-- @click="handleSelectChange(index,item)" -->
+						<input class="input" v-model="item.current" type="number" adjust-position="false" keyboard-type="decimal" confirm-type="done" :disabled="item.isTypeOpen==='0'" placeholder="请输入电流" />
 						<text class="item_label">A</text>
 						<button class="btn" style="display:inline" @click="setDianliu(item)">保存</button>
 					</view>
@@ -200,7 +201,7 @@ export default {
 <style>
 	.set_wrap{
 		width: 100%;
-		height: 100vh;
+		height: 100%;
 		box-sizing: border-box;
 		padding: 20px;
 		background-image: url("../../image/login.png");
@@ -218,7 +219,7 @@ export default {
 		left: 20px;
 	}
 	.set_list{
-		margin-top: 60px;
+		margin-top: 40px;
 		display: flex;
 		align-items: center;
 	}
@@ -259,8 +260,8 @@ export default {
 		padding: 5px;
 		border: 1px solid silver;
 		font-size: 32px;
-		height: 100px;
-		width: 140px;
+		height: 60px;
+		width: 180px;
 		margin-left: 20px;
 		border-radius: 10px;
 	}
@@ -269,7 +270,7 @@ export default {
 		border-radius: 10px;
 		font-size: 32px;
         width: 90px;
-        height: 100px;
+        height: 60px;
 		margin-left: 20px;
         color: #fff;
         background-image: linear-gradient(to bottom, #00b, #006);