Merge branch 'master' of http://115.238.57.190:3000/linan/HY.yield.client

src/views/device/deviceFault.vue

@@ -21,7 +21,7 @@
                     <!-- <el-table-column prop="farmId" label="农场ID"></el-table-column> -->
                     <el-table-column label="安装日期">
                         <template v-slot="scope">
-                            <span>{{ scope.row['installTime'].substr(0,10) }}</span>
+                            <span>{{ scope.row['installTime'] }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="name" label="设备名称"></el-table-column>
@@ -232,7 +232,6 @@ export default {
                 });
         },
         pageChange(p) {
-            console.log(p);
             this.pageNum = p;
             // 设备故障列表
             this.getDvFaultList();