1，新加账号信息；2，样式修改；3，显示销售数量；4，显示当日所有报警内容。

pages/Charts/mainStatistics.vue

@@ -1,10 +1,18 @@
 <template>
 	<view>
+		<view class="head">
+			<view class="company">
+				<font style="color: #F76260;">申泽棉花糖后台</font>
+			</view>
+			<view class="pname">
+				<font class="wenzi" style="color: #F76260;text-align:right">用户：{{pname}}</font>
+			</view>
+		</view>
 		<view class="qiun-title-bar color">
-			<view class="qiun-title-dot-light"><font style="color: #FFFFFF;">今日收入总额: {{dayTotalMoney}}</font></view>
-			<view class="qiun-title-dot-light"><font style="color: #FFFFFF;">本周收入总额: {{weekTotalMoney}}</font></view>
-			<view class="qiun-title-dot-light"><font style="color: #FFFFFF;">本月收入总额: {{monthTotalMoney}}</font></view>
-			<view class="qiun-title-dot-light"><font style="color: #FFFFFF;">本年度收入总额: {{yearTotalMoney}}</font></view>
+			<view class="qiun-title-dot-light1"><font style="color: #FFFFFF;">今日收入总额: {{dayTotalMoney}}  销售数量:{{dayTotalNum}}</font></view>
+			<view class="qiun-title-dot-light1"><font style="color: #FFFFFF;">本周收入总额: {{weekTotalMoney}}  销售数量:{{weekTotalNum}}</font></view>
+			<view class="qiun-title-dot-light1"><font style="color: #FFFFFF;">本月收入总额: {{monthTotalMoney}}  销售数量:{{monthTotalNum}}</font></view>
+			<view class="qiun-title-dot-light1"><font style="color: #FFFFFF;">本年度收入总额: {{yearTotalMoney}}  销售数量:{{yearTotalNum}}</font></view>
 		</view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
@@ -82,10 +90,15 @@
 		},
 		data() {
 			return {
+				pname:'',
 				dayTotalMoney:0,
+				dayTotalNum:0,
 				weekTotalMoney:0,
+				weekTotalNum:0,
 				monthTotalMoney:0,
+				monthTotalNum:0,
 				yearTotalMoney:0,
+				yearTotalNum:0,
 				cWidth: '',
 				cHeight: '',
 				pixelRatio: 1,
@@ -106,6 +119,8 @@
 		// 	this.init();
 		// },
 		onShow() {
+			var pname = uni.getStorageSync("name");
+			this.pname = pname;
 			var test = uni.getStorageSync('test');
 			//判断是不是初次登陆
 			if(test == 2){
@@ -113,7 +128,9 @@
 			}
 		},
 		mounted() {
-			console.log("mounted")
+			console.log("mounted");
+			var pname = uni.getStorageSync("name");
+			this.pname = pname;
 			this.init();
 		},
 		methods: {
@@ -311,15 +328,19 @@
 						for (let bean of data) {
 							if(bean['categorie']==='day'){
 								this.dayTotalMoney=bean['salePrice'];
+								this.dayTotalNum=bean['saleNum'];
 							}
 							if(bean['categorie']==='week'){
 								this.weekTotalMoney=bean['salePrice'];
+								this.weekTotalNum=bean['saleNum'];
 							}
 							if(bean['categorie']==='month'){
 								this.monthTotalMoney=bean['salePrice'];
+								this.monthTotalNum=bean['saleNum'];
 							}
 							if(bean['categorie']==='year'){
 								this.yearTotalMoney=bean['salePrice'];
+								this.yearTotalNum=bean['saleNum'];
 							}
 						}
 						uni.stopPullDownRefresh();
@@ -419,7 +440,25 @@
 		width: 750upx;
 		overflow-x: hidden;
 	}
-	
+	.head{
+		display: flex;
+		flex-direction: row;
+	}
+	.company{
+		padding-left: 15upx;
+		width: 48%;
+	}
+	.pname{
+		width: 48%;
+		text-align:right;
+	}
+	.wenzi{
+		padding-right: 0upx;
+		/* text-align:right; */
+		white-space: nowrap;
+		overflow: hidden;
+		/* text-overflow: ellipsis; */
+	}
 	.qiun-padding {
 		padding: 2%;
 		width: 96%;
@@ -442,6 +481,7 @@
 	
 	.qiun-common-mt {
 		margin-top: 0upx;
+		height: 170upx;
 	}
 	
 	.qiun-bg-white {
@@ -465,7 +505,15 @@
 		font-size: 50upx;
 		color: #000000;
 	}
-	
+	.qiun-title-dot-light1 {
+		/* border-left: 10upx solid #0ea391; */
+		padding-top: 10upx;
+		border-left: 20upx;
+		padding-left: 20upx;
+		font-family: "宋体";
+		font-size: 30upx;
+		color: #000000;
+	}
 	.qiun-charts {
 		width: 750upx;
 		height: 430upx;
@@ -480,9 +528,9 @@
 		margin: auto;
 	}
 	.preImg {
-		position: absolute;left: 40upx; width: 40upx;height: 40upx;
+		position: absolute;left: 40upx; width: 60upx;height: 60upx;
 	}
 	.nextImg {
-		position: absolute;right: 40upx; width: 40upx;height: 40upx;
+		position: absolute;right: 40upx; width: 60upx;height: 60upx;
 	}
 </style>

pages/User/equipmentStatusList.vue

@@ -16,7 +16,15 @@
 											<view><span>温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
 											<view><span>湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
 											<view><span>转速：</span><span>{{equipment.furnaceSp?equipment.furnaceSp:''}}</span></view>
-											<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}  {{equipment.alarmContent}}</span></view>
+											<view class="" v-if="equipment.hasTodayAlarm">
+												<view><span>报警内容：</span></view>
+												<view v-for="(alarm,index) in equipment.alarmList" :key="index">
+													<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}}  {{alarm.alarmContent}}</span></view>
+												</view>
+											</view>
+											<view class="" v-else>
+												<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}  {{equipment.alarmContent}}</span></view>
+											</view>
 										</view>
 									</uni-collapse-item>
 								</view>
@@ -38,7 +46,15 @@
 						<view><span>温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
 						<view><span>湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
 						<view><span>转速：</span><span>{{equipment.furnaceSp?equipment.furnaceSp:''}}</span></view>
-						<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}  {{equipment.alarmContent}}</span></view>
+						<view class="" v-if="equipment.hasTodayAlarm">
+							<view><span>报警内容：</span></view>
+							<view v-for="(alarm,index) in equipment.alarmList" :key="index">
+								<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}}  {{alarm.alarmContent}}</span></view>
+							</view>
+						</view>
+						<view class="" v-else>
+							<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}  {{equipment.alarmContent}}</span></view>
+						</view>
 					</view>
 				</uni-collapse-item>
 			</view>
@@ -118,4 +134,7 @@
 	.status-normal {
 		background-color: #4cd964
 	}
+	.baojing{
+		padding-left: 120upx;
+	}
 </style>

pages/User/user.vue

@@ -126,7 +126,7 @@
 			},
 			...mapActions('chart', ['updata']),
 			updata1() {
-				if (this.parm != null) {
+				if (this.parm.id != null) {
 					this.updata(this.parm)
 						.then(res => {
 							var merchantList = res;