liqianyi 6 meses atrás
pai
commit
48d22e1a43

+ 1 - 1
src/views/modules/device/device-history.vue

@@ -35,7 +35,7 @@
         label="设备编号">
       </el-table-column>
       <el-table-column
-        prop="recordTime"
+        prop="deviceTime"
         header-align="center"
         align="center"
         min-width="160"

+ 2 - 2
src/views/modules/device/device-list.vue

@@ -229,7 +229,7 @@
             <el-button v-if="isAuth('prod:equipment:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
             <el-button v-if="isAuth('prod:updateVerification:update')" type="text" size="small" @click="historyHandle(scope.row)">检定</el-button>
             <el-button v-if="isAuth('prod:updateBreakage:update')" type="text" size="small" @click="historyHandle(scope.row)">报损</el-button>
-            <el-button v-if="isAuth('prod:equipment:info')" type="text" size="small" @click="historyHandle(scope.row.id)">历史数据</el-button>
+            <el-button v-if="isAuth('prod:equipment:info')" type="text" size="small" @click="historyHandle(scope.row)">历史数据</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -366,7 +366,7 @@ export default {
     historyHandle (row) {
       this.historyVisible = true
       this.$nextTick(() => {
-        this.$refs.history.init(row.code)
+        this.$refs.history.init(row.codeNumber)
       })
     },
     // 删除