Merge remote-tracking branch 'origin/lifeline_develop_siping' into lifeline_develop_siping

src/views/SentryCockpit.vue

@@ -5,7 +5,7 @@
 		<div class="con_left con_left_js">
 			<div class="list_tit">基本信息</div>
 			<div class="info-list_left">
-				<p>用户总数：{{totalUsers}}户</p>
+				<p>用户总数：{{businessUsers + civilUsers + industryUsers }}户</p>
 				<p>管线总长：{{totalLength}}公里</p>
 				<p>商业用户：{{businessUsers}}户 </p>
 				<p>中压长度：{{centerPressLength}}公里</p>
@@ -293,7 +293,6 @@
         tabList:[ '四平市', '铁东区', '铁西区'],
 
         /** 用户数量信息 **/
-        totalUsers:0,
         businessUsers:0,
         civilUsers:0,
         industryUsers:0,
@@ -322,10 +321,9 @@
       },
       userStats(){
         userStats().then(req => {
-          this.totalUsers=req.data.totalUsers;
-          this.businessUsers=req.data.businessUsers;
-          this.civilUsers=req.data.civilUsers;
-          this.industryUsers=req.data.industryUsers;
+          this.businessUsers = req.data.find(item => item.name === "business").value;
+          this.civilUsers = req.data.find(item => item.name === "civil").value;
+          this.industryUsers = req.data.find(item => item.name === "industry").value;
           this.yhfxChart();
         })
       },