yxp 1 год назад
Родитель
Сommit
c12711f260
4 измененных файлов с 51 добавлено и 32 удалено
  1. 3 3
      locale/en.json
  2. 1 1
      pages/index.vue
  3. 26 16
      pages/weitiandi/bluetooth/status.vue
  4. 21 12
      pages/weitiandi/device/status.vue

+ 3 - 3
locale/en.json

@@ -223,12 +223,12 @@
     "planed": " Reserved",
     "connected": "Connected",
     "nocharge": "Idle",
-    "devtemper": "Temperature",
-    "voltage": "Voltage",
+    "devtemper": "TEMP",
+    "voltage": "VOLT",
     "current": "Current",
     "chargetime": "Charging time",
     "lefttime": "Left Time",
-    "power": "Power",
+    "power": "POWER",
 
 
     "startcharge": "Start",

+ 1 - 1
pages/index.vue

@@ -49,7 +49,7 @@
 							style="width: 60px;height: 60px;margin-top: 2vh;"></image>
 					</view>
 					<view style="color: aliceblue;">
-						Scan with WIFI
+						Wifi Config
 					</view>
 				</view>
 				<!-- <view class="" @click="scan">

+ 26 - 16
pages/weitiandi/bluetooth/status.vue

@@ -225,6 +225,10 @@
 	  				    {{$t('charge.nocharge')}}
 	  				  </view>
 	  				</view>
+					<view class="p2">
+					<view class="item-value" v-if="portDetail.voltage == 0">0 {{ i18('度') }}</view>
+					<view class="item-value" v-else>{{ dianliang }} {{ i18('度') }}</view>
+					</view>
 	  			</view>
 	  		</view>
 	  	</view>
@@ -232,36 +236,36 @@
 		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 5vh;">
 			 <view  class="port_item" :class="item.id==choosePort?'selected_item':''" v-for="item in curPort" @click="selectPort(item.id);">{{ i18(item.text )}}</view>
 			<view
-				style="background-color:#494E51 ;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 76vw;;border-radius: 27px;">
-				<view span="3" style="width: 19vw;">
+				style="background-color:#494E51 ;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 75vw;;border-radius: 27px;">
+				<view span="4" style="width: 25vw;">
 					<view class="item-value">{{ deviceV  }}V</view>
 					<span class="item-text">{{$t('charge.voltage')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 19vw;">
+				<view span="4" style="width: 25vw;">
 					<view class="item-value">{{ gonglv  }}W</view>
 					<span class="item-text">{{$t('charge.power')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 19vw;">
+				<view span="4" style="width: 25vw;margin-top: -5px;">
 					<view class="item-value">{{deviceTemp}}℃</view>
 					<span class="item-text">{{$t('charge.devtemper')}}</span>
 				</view>
-				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 19vw;">
+				<!-- <u-line direction="col" color="#6F84AC" length="50"></u-line> -->
+				<!-- <view span="3" style="width: 19vw;">
 					<view class="item-value" v-if="portDetail.voltage == 0">0 {{ i18('度') }}</view>
 					<view class="item-value" v-else>{{ dianliang }} {{ i18('度') }}</view>
 					<span class="item-text">{{$t('charge.elec')}}</span>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		
 		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 3vh;">
 			<view
-          style="position:relative;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 100%;height: 6vh;}">
-        <view  style="width: 25vw;left:10%;position: absolute;font-size: 11px;">
-					<view style="margin-left: 1vh;;width: 100px">
-						<view><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
+				style="position:relative;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 100%;height: 6vh;}">
+				<view  style="width: 27vw;left:5vw;position: absolute;font-size: 11px;">
+					<view style="margin-left: 1vh;">
+						<view style="font-weight: bold;"><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
 							<span  v-else>{{$t('charge.chargetime')}}</span></view>
 						<view class="demo-layout bg-purple"
 							style="border-radius: 8px;background-color: aliceblue;color: #000;">
@@ -270,11 +274,11 @@
 						</view>
 					</view>
 				</view>
-        <view span="2" style="width: 100px;left:36%;position: absolute">
+				<view span="2" style=";left:34vw;position: absolute">
 					<view v-if="portDetail.portStatus == 2"
 						style="text-align: center;position: absolute;margin:-1vh 2vw;border: 0ch;height: 20vh;">
 						<u-button @click="toPage()" shape="circle"
-							style="background: #ec3e41;color:white;width: 28vw;border: 0ch;height: 6vh;">Charge</u-button>
+							style="background: #ec3e41;color:white;width: 28vw;border: 0ch;height: 6vh;">STOP</u-button>
 					</view>
 					<view v-if="portDetail.portStatus != 2"
 						style="text-align: center;position: absolute;margin:-1vh 2vw;border: 0ch;height: 20vh;">
@@ -293,9 +297,9 @@
 										  <view>{{ i18('立即充电') }}</view>
 										</view> -->
 				</view>
-        <view span="3" style="width: 25vw;left:65%;position: absolute">
+				<view span="3" style="width: 26vw;left:65%;position: absolute">
 					<view style="margin-left: 3vw;font-size: 11px;">
-						<view> Ampere</view>
+						<view style="font-weight: bold;"> Ampere</view>
 						<view class="demo-layout bg-purple"
 							style="border-radius: 8px;background-color: aliceblue;color: #000;">
 							<view v-if="deviceV  == 0">0A</view>
@@ -1752,7 +1756,7 @@ export default {
 .item-value{
   font-weight: bold;
   font-size: 15px;
-  margin:4px 0;
+  margin:8px 0 0 0;
 }
 .item-text{
   font-size: 11px;
@@ -1817,6 +1821,12 @@ export default {
 		margin-top: 10px;
 		/* margin-left: -1vh;; */
 	}
+	.p2{
+		font-size: 20px;
+		color: #888;
+		font-weight: bold;
+		
+	}
 .stip{
   text-align: center;
   z-index: 9999;

+ 21 - 12
pages/weitiandi/device/status.vue

@@ -76,6 +76,10 @@
 						    {{$t('charge.nocharge')}}
 						  </view>
 						</view>
+						<view class="p2">
+						<view class="item-value" v-if="portDetail.voltage == 0">0 {{ i18('度') }}</view>
+						<view class="item-value" v-else>{{ dianliang }} {{ i18('度') }}</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -129,27 +133,26 @@
 		
 		<view style="display: flex;align-items: center;flex-direction: column;color: aliceblue;margin-top: 5vh;">
 			<view
-				style="background-color: #494E51;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 76vw;;border-radius: 27px;">
-				<view span="3" style="width: 19vw;">
+				style="background-color: #494E51;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 75vw;;border-radius: 27px;">
+				<view span="4" style="width: 25vw;">
 					<view class="item-value">{{ deviceV  }}V</view>
 					<span class="item-text">{{$t('charge.voltage')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 19vw;">
+				<view span="4" style="width: 25vw;">
 					<view class="item-value">{{ gonglv  }}W</view>
 					<span class="item-text">{{$t('charge.power')}}</span>
 				</view>
 				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 19vw;">
+				<view span="4" style="width: 25vw; margin-top: -5px;">
 					<view class="item-value">{{deviceTemp}}℃</view>
 					<span class="item-text">{{$t('charge.devtemper')}}</span>
 				</view>
-				<u-line direction="col" color="#6F84AC" length="50"></u-line>
-				<view span="3" style="width: 19vw;">
+				<!-- <view span="3" style="width: 19vw;">
 					<view class="item-value" v-if="portDetail.voltage == 0">0 {{ i18('度') }}</view>
 					<view class="item-value" v-else>{{ dianliang }} {{ i18('度') }}</view>
 					<span class="item-text">{{$t('charge.elec')}}</span>
-				</view>
+				</view> -->
 			</view>
 		</view>
 
@@ -158,7 +161,7 @@
 				style="position:relative;justify-content: center;display: flex;justify-items: center;flex-direction: row;text-align: center;width: 100%;height: 6vh;}">
 				<view  style="width: 27vw;left:5vw;position: absolute;font-size: 11px;">
 					<view style="margin-left: 1vh;">
-						<view><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
+						<view style="font-weight: bold;"><span v-if="portDetail.portStatus == 6">{{i18('剩余时间')}}</span>
 							<span  v-else>{{$t('charge.chargetime')}}</span></view>
 						<view class="demo-layout bg-purple"
 							style="border-radius: 8px;background-color: aliceblue;color: #000;">
@@ -171,7 +174,7 @@
 					<view v-if="portDetail.portStatus == 2"
 						style="text-align: center;position: absolute;margin:-1vh 2vw;border: 0ch;height: 20vh;">
 						<u-button @click="toPage()" shape="circle"
-							style="background: #ec3e41;color:white;width: 28vw;border: 0ch;height: 6vh;">Charge</u-button>
+							style="background: #ec3e41;color:white;width: 28vw;border: 0ch;height: 6vh;">STOP</u-button>
 					</view>
 					<view v-if="portDetail.portStatus != 2"
 						style="text-align: center;position: absolute;margin:-1vh 2vw;border: 0ch;height: 20vh;">
@@ -192,7 +195,7 @@
 				</view>
 				<view span="3" style="width: 26vw;left:65%;position: absolute">
 					<view style="margin-left: 3vw;font-size: 11px;">
-						<view> Ampere</view>
+						<view style="font-weight: bold;"> Ampere</view>
 						<view class="demo-layout bg-purple"
 							style="border-radius: 8px;background-color: aliceblue;color: #000;">
 							<view v-if="deviceV  == 0">0A</view>
@@ -1492,12 +1495,12 @@
 	.item-value {
 		font-weight: bold;
 		font-size: 15px;
-		margin: 4px 0;
+		margin:8px 0 0 0;
 	}
 
 	.item-text {
 		font-size: 11px;
-		margin: 1px 0;
+		margin: 0px 0;
 		color: aliceblue;
 
 	}
@@ -1558,6 +1561,12 @@
 		margin-top: 10px;
 		/* margin-left: -1vh;; */
 	}
+	.p2{
+		color: #888;
+		font-size: 20px;
+		font-weight: bold;
+		
+	}
 
 	.stip {
 		text-align: center;