设备日志信息完善

src/views/system/log/index.vue

@@ -103,6 +103,11 @@
       <el-table-column label="请求序列号" align="center" prop="seq" width="180"/>
       <el-table-column label="消息类型" align="center" prop="mqttType" :formatter="(row) => filedFormatter(row.mqttType)"/>
       <el-table-column label="消息描述" align="center" prop="mqttDescribe" />
+      <el-table-column label="回复结果" align="center" prop="result">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.device_log_result" :value="scope.row.result"/>
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="消息主体参数" align="center" prop="payload" />-->
       <el-table-column label="消息主题" align="center" prop="topic" width="180"/>
       <el-table-column label="操作人" align="center" prop="createBy" />
@@ -178,12 +183,21 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="消息主题" prop="topic">
+              <el-input v-model="form.topic" placeholder="请输入消息主题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="回复结果" prop="result">
+              <el-input v-model="form.result" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="消息参数" prop="payload">
           <el-input v-model="form.payload" type="textarea" :rows="5"  />
         </el-form-item>
-        <el-form-item label="消息主题" prop="topic">
-          <el-input v-model="form.topic" placeholder="请输入消息主题" />
-        </el-form-item>
         <el-form-item label="回复信息" prop="remark">
           <el-input v-model="form.remark" type="textarea" :rows="5" />
         </el-form-item>
@@ -200,6 +214,7 @@ import { listLog, getLog, delLog } from "@/api/system/log";
 
 export default {
   name: "Log",
+  dicts: ['device_log_result'],
   data() {
     return {
       // 遮罩层
@@ -276,7 +291,8 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
+        result: null
       };
       this.resetForm("form");
     },
@@ -308,6 +324,7 @@ export default {
       const id = row.id || this.ids
       getLog(id).then(response => {
         this.form = response.data;
+        this.form.result = this.deviceLogResultFormat(response.data.result)
         this.open = true;
         this.title = "查看设备操作日志";
       });
@@ -350,6 +367,10 @@ export default {
     },
     filedFormatter(value) {
       return this.mqttTypeOptions[value];
+    },
+    // 回复结果字典翻译
+    deviceLogResultFormat(value) {
+      return this.selectDictLabel(this.dict.type.device_log_result, value);
     }
   }
 };

src/views/system/statusLog/index.vue

@@ -122,12 +122,21 @@
         </el-form-item>
         </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="消息主题" prop="topic">
+              <el-input v-model="operateLogForm.topic" placeholder="请输入消息主题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="回复结果" prop="result">
+              <el-input v-model="operateLogForm.result" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="消息参数" prop="payload">
           <el-input v-model="operateLogForm.payload" type="textarea" :rows="5"  />
         </el-form-item>
-        <el-form-item label="消息主题" prop="topic">
-          <el-input v-model="operateLogForm.topic" placeholder="请输入消息主题" />
-        </el-form-item>
         <el-form-item label="回复信息" prop="remark">
           <el-input v-model="operateLogForm.remark" type="textarea" :rows="5" />
         </el-form-item>
@@ -146,7 +155,7 @@ import { getLog } from "@/api/system/log";
 
 export default {
   name: "sLog",
-  dicts: ['device_status'],
+  dicts: ['device_status','device_log_result'],
   data() {
     return {
       // 遮罩层
@@ -247,7 +256,8 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
+        result: null
       };
       this.resetForm("operateLogForm");
     },
@@ -269,9 +279,14 @@ export default {
       const id = row.operateLogId;
       getLog(id).then(response => {
         this.operateLogForm = response.data;
+        this.operateLogForm.result = this.deviceLogResultFormat(response.data.result)
         this.open = true;
         this.title = "设备操作日志";
       });
+    },
+    // 回复结果字典翻译
+    deviceLogResultFormat(value) {
+      return this.selectDictLabel(this.dict.type.device_log_result, value);
     }
   }
 };