ソースを参照

修改维护信息状态

Limengbo 4 年 前
コミット
4df8b4320c
2 ファイル変更8 行追加6 行削除
  1. 3 2
      src/store/modules/admin.js
  2. 5 4
      src/views/admin/device/index.vue

+ 3 - 2
src/store/modules/admin.js

@@ -34,8 +34,9 @@ const mutations = {
   GET_Log: (state, data) => {
     if (data.length > 0) {
       data.forEach(item => {
-        item.deviceLog.gmtModified = (parseTime(item.deviceLog.gmtModified))
-        item.deviceLog.gmtCreated = (parseTime(item.deviceLog.gmtCreated))
+        item.deviceLog.status = item.deviceLog.status === 'UNNORMAL' ? '未维护' : '已维护'
+        item.deviceLog.gmtModified = parseTime(item.deviceLog.gmtModified)
+        item.deviceLog.gmtCreated = parseTime(item.deviceLog.gmtCreated)
       })
     }
     state.logData = data

+ 5 - 4
src/views/admin/device/index.vue

@@ -233,7 +233,6 @@ export default {
     ...mapGetters(['deviceData'])
   },
   created() {
-    console.log(111, this.type.indexOf('2'))
     if (this.type.indexOf('2') !== -1) {
       this.$store.dispatch('admin/getDeviceData', {
         modifier: this.uid
@@ -282,8 +281,7 @@ export default {
       this.$store.dispatch('admin/queryLogData', {
         deviceId: row.id,
         deviceCode: row.deviceCode,
-        opType: 'MODIFIED',
-        status: 'NORMAL'
+        opType: 'MODIFIED'
       }).then(() => {
         this.gridData = this.$store.getters.logData
         this.gridTile = '维护信息'
@@ -297,6 +295,9 @@ export default {
           label: '解决日期',
           type: 'deviceLog[gmtCreated]'
         }, {
+          label: '维护状态',
+          type: 'deviceLog[status]'
+        }, {
           label: '解决方案',
           type: 'deviceLog[description]'
         }]
@@ -322,7 +323,7 @@ export default {
           type: 'deviceLog[gmtCreated]'
         }, {
           label: '设备连接用户',
-          type: 'deviceModifier[name]'
+          type: 'deviceLog[mobile]'
         }]
         this.dialogTableVisible = true
       })