运营端设备状态显示bug修复

imcs-bt-admin/imcs-bt-admin/src/api/enterpriseMgr/productionResourcesMgr.js

@@ -17,6 +17,10 @@ const apiList = {
     method: 'POST',
     url: `/authority/productionresource/update`
   },
+  equStatistics: {
+    method: 'POST',
+    url: `/authority/productionResource/equStatistics`
+  },
   remove: {
     method: 'DELETE',
     url: `/authority/productionresource`
@@ -56,6 +60,13 @@ export default {
       data
     })
   },
+  equStatistics(data, custom = {}) {
+    return axiosApi({
+      ...apiList.equStatistics,
+      data,
+      custom
+    })
+  },
   remove (data) {
     return axiosApi({
       ...apiList.remove,

imcs-bt-admin/imcs-bt-admin/src/views/zuihou/internetCenter/productionResourcesMgr/Index.vue

@@ -98,12 +98,8 @@
 		    		</el-col>
 		    		<el-col :span="4" class="tongjiBg">
 		    			<p><span class="statusSpan lixianStatus"></span>离线</p>
-		    			<p>{{ this.deviceCount.offLineCount }}</p>
-		    		</el-col>
-		    		<el-col :span="4" class="tongjiBg">
-		    			<p><span class="statusSpan weijihuoStatus"></span>未激活</p>
-		    			<p>{{ this.deviceCount.unActiveCount }}</p>
-		    		</el-col>
+		    			<p>{{ this.deviceCount.offlineCount }}</p>
+		    		</el-col>		    		
 		    		<el-col :span="8" class="tongjiBg">
 		    			<p style="text-align: left;"><a class="shuaxinBtn" href="javascript:;" @click="fetch">刷新</a></p>
 		    		</el-col>
@@ -160,21 +156,21 @@
 		          </el-tag>
 		        </template>
 		      </el-table-column>
-		      <el-table-column prop="status" label="连接状态" align="center" width="90px">
+		      <el-table-column prop="onlineStatus" label="连接状态" align="center" width="90px">
 		        <template slot-scope="{ row }">
-		          <el-tag :type="row.status=='1' ? 'success' : 'info'">
-		          	{{ row.status=='1' ? '在线' : '离线' }}
+		          <el-tag :type="row.onlineStatus=='1' ? 'success' : 'info'">
+		          	{{ row.onlineStatus=='1' ? '在线' : '离线' }}
 		          </el-tag>
 		        </template>
 		      </el-table-column>
 		      <el-table-column prop="category.data" label="分类" :show-overflow-tooltip="true" width="120px"></el-table-column>
-		      <el-table-column prop="tenantDesc" label="所属企业" :show-overflow-tooltip="true" width="120px"></el-table-column>
+		      <el-table-column prop="tenantDesc" label="所属企业" :show-overflow-tooltip="true"></el-table-column>
 		      <el-table-column
 		        :label="$t('table.operation')"
 		        fixed="right"
 		        align="center"
 		        column-key="operation"
-		        width="140px"
+		        width="180px"
 		      >
 		        <template slot-scope="{ row }">
 		        	<el-tooltip class="item" content="查看详情" effect="dark" placement="top-start">
@@ -323,6 +319,7 @@ export default {
   	this.getProductionLineList();
   	// 获取【模型数据】
   	this.getModuleList();
+	this.getDeviceCount();
 	},
   // 监听数据的变化
   watch: {
@@ -532,6 +529,18 @@ export default {
         }
       })
     },
+	getDeviceCount(){
+		productionResourcesMgrApi.equStatistics({}).then(response => {
+        const res = response.data;
+        let that = this
+        if (res.isSuccess) {          
+          that.deviceCount.onLineCount = res.data.onLineCount 
+		  that.deviceCount.offlineCount = res.data.offlineCount 
+		  //that.indexCount.deviceCount.exceptCount = res.data.exceptCount   
+		  //that.indexCount.deviceCount.totalCount = res.data.onLineCount + res.data.offlineCount +res.data.exceptCount          
+        }
+      }).finally(() => this.loading = false);
+	},
     view (row) {
       this.$refs.view.setTenant(row, this.dicts)
       this.tenantViewVisible = true
@@ -585,7 +594,7 @@ export default {
         		item.srcList = [item.pic];
         	})
 		  this.deviceCount.totalCount = this.tableData.total
-          this.deviceCount.unActiveCount = this.tableData.total 		  
+          //this.deviceCount.unActiveCount = this.tableData.total 		  
           console.log("列表数据", this.tableData);
         }
         // eslint-disable-next-line no-return-assign