Merge branch 'V0.0.6_iot' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.6_iot

src/views/iot/sensorData/index.vue

@@ -85,10 +85,10 @@
             size="small"
           >
             <el-table-column label="设备名称" align="center" prop="deviceName" width="220"/>
-            <el-table-column label="资产类别" align="center" prop="assetsType" width="220"/>
             <el-table-column label="设备类型" align="center" prop="categoryType"/>
             <el-table-column label="所属机构" align="center" prop="orgName" width="220"/>
-            <el-table-column label="上报时间" align="center" prop="updateTime" width="220"/>
+            <el-table-column label="告警状态" align="center" prop="alarmStatus" width="220"/>
+            <el-table-column label="最近一次上报时间" align="center" prop="updateTime" width="220"/>
             <el-table-column label="上报内容" align="center" prop="info" width="220" show-overflow-tooltip="showOverflowTooltip"/>
             <el-table-column
               label="操作"

src/views/iot/videoRecorder/detail.dialog.vue

@@ -17,7 +17,7 @@
           <el-descriptions-item labelClassName="gx_info_label" label="所属机构">
             {{ dvr.orgName }}
           </el-descriptions-item>
-          <el-descriptions-item labelClassName="gx_info_label" label="监控主机">
+          <el-descriptions-item labelClassName="gx_info_label" label="硬盘录像机">
             {{ dvr.equipmentName }}
           </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="网络状态">
@@ -100,7 +100,7 @@
             >
             </DataRangePicker>
           </el-form-item>
-      
+
             <el-button
                   type="primary"
                   icon="el-icon-search"
@@ -115,8 +115,8 @@
                   @click="resetQuery"
                   >重置
                 </el-button>
-         
-          
+
+
           <div class="extend_mod">
             <el-table
               v-loading="loading"
@@ -150,7 +150,7 @@
                   <span :style="{ color: '#ebb665' }">{{
                     scope.row.project
                   }}</span>
-              
+
                 </template>
               </el-table-column>
               <el-table-column
@@ -158,7 +158,7 @@
                 align="center"
                 prop="situation"
               >
-                
+
               </el-table-column>
               <el-table-column
                 label="告警恢复时间"

src/views/iot/videoRecorder/index.vue

@@ -21,10 +21,10 @@
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
-              <el-form-item label="监控主机" prop="hostName">
+              <el-form-item label="硬盘录像机" prop="hostName">
                 <el-input
                   v-model="queryParams.hostName"
-                  placeholder="请输入监控主机名称"
+                  placeholder="请输入硬盘录像机名称"
                   clearable
                   @keyup.enter.native="handleQuery"
                   maxlength="50"
@@ -77,10 +77,10 @@
               </el-col> -->
               <el-col :span="19">
                 <div class="numCls">
-                  <div>监控主机总数:{{ dvrdiskStatistic.dvrTotal }}</div>
+                  <div>硬盘录像机总数:{{ dvrdiskStatistic.dvrTotal }}</div>
                   <div>硬盘总数:{{ dvrdiskStatistic.diskTotal }}</div>
                   <div>
-                    异常总数:<span :style="{ color: '#fb5d70' }">{{
+                    异常硬盘总数:<span :style="{ color: '#fb5d70' }">{{
                       dvrdiskStatistic.diskExceptionCount
                     }}</span>
                   </div>
@@ -121,7 +121,7 @@
               width="220"
             />
             <el-table-column
-              label="监控主机"
+              label="硬盘录像机"
               align="center"
               prop="equipmentName"
               width="220"
@@ -158,7 +158,7 @@
             </el-table-column>
 
             <el-table-column
-              label="异常数量(序号)"
+              label="异常硬盘数量"
               align="center"
               prop="diskExceptionCount"
               width="150"