diff --git a/src/api/ss/commandLog.js b/src/api/ss/commandLog.js
new file mode 100644
index 0000000..5648c7f
--- /dev/null
+++ b/src/api/ss/commandLog.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询命令日志列表
+export function listCommandLog(query) {
+  return request({
+    url: '/ss/commandLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询命令日志详细
+export function getCommandLog(id) {
+  return request({
+    url: '/ss/commandLog/' + id,
+    method: 'get'
+  })
+}
+
+// 新增命令日志
+export function addCommandLog(data) {
+  return request({
+    url: '/ss/commandLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改命令日志
+export function updateCommandLog(data) {
+  return request({
+    url: '/ss/commandLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除命令日志
+export function delCommandLog(id) {
+  return request({
+    url: '/ss/commandLog/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/ss/commandLog/index.vue b/src/views/ss/commandLog/index.vue
new file mode 100644
index 0000000..8ef8aeb
--- /dev/null
+++ b/src/views/ss/commandLog/index.vue
@@ -0,0 +1,438 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable @change="handleQuery">
+          <el-option
+            v-for="dict in dict.type.command_log_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="MAC号" prop="mac">
+        <el-input
+          v-model="queryParams.mac"
+          placeholder="请输入MAC号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原因" prop="reason">
+        <el-input
+          v-model="queryParams.reason"
+          placeholder="请输入发送命令的原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="命令" prop="command">
+        <el-input
+          v-model="queryParams.command"
+          placeholder="请输入命令"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="结果" prop="result">
+        <el-input
+          v-model="queryParams.result"
+          placeholder="请输入命令发送的结果"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="操作人" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入操作人名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="操作人类型" prop="userType" label-width="6em">
+        <el-select v-model="queryParams.userType" placeholder="请选择操作人类型" clearable @change="handleQuery">
+          <el-option
+            v-for="dict in dict.type.login_user_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作时间" prop="operaTimeRange">
+        <el-date-picker
+          v-model="queryParams.operaTimeRange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['ss:commandLog:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['ss:commandLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="commandLogList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <template v-for="column of showColumns">
+        <el-table-column
+            :key="column.key"
+            :label="column.label"
+            :prop="column.key"
+            :align="column.align"
+            :min-width="column.minWidth"
+            :sort-orders="orderSorts"
+            :sortable="column.sortable"
+            :show-overflow-tooltip="column.overflow"
+            :width="column.width"
+        >
+          <template slot-scope="d">
+            <template v-if="column.key === 'id'">
+              {{d.row[column.key]}}
+            </template>
+            <template v-else-if="column.key === 'type'">
+              <dict-tag :options="dict.type.command_log_type" :value="d.row[column.key]"/>
+            </template>
+            <template v-else-if="column.key === 'userType'">
+              <dict-tag :options="dict.type.login_user_type" :value="d.row[column.key]"/>
+            </template>
+            <template v-else-if="column.key === 'userName'">
+              <user-link v-if="UserType.APP === d.row.userType" :name="d.row.userName" :id="d.row.userId"/>
+              <template v-else>{{d.row.userName}}</template>
+            </template>
+            <template v-else>
+              {{d.row[column.key]}}
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ss:commandLog:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改命令日志对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option
+              v-for="dict in dict.type.command_log_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="MAC号" prop="mac">
+          <el-input v-model="form.mac" placeholder="请输入MAC号" />
+        </el-form-item>
+        <el-form-item label="发送命令的原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入发送命令的原因" />
+        </el-form-item>
+        <el-form-item label="命令" prop="command">
+          <el-input v-model="form.command" placeholder="请输入命令" />
+        </el-form-item>
+        <el-form-item label="命令发送的结果" prop="result">
+          <el-input v-model="form.result" placeholder="请输入命令发送的结果" />
+        </el-form-item>
+        <el-form-item label="操作人" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入操作人" />
+        </el-form-item>
+        <el-form-item label="操作人名称" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入操作人名称" />
+        </el-form-item>
+        <el-form-item label="操作人类型" prop="userType">
+          <el-select v-model="form.userType" placeholder="请选择操作人类型">
+            <el-option
+              v-for="dict in dict.type.login_user_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="操作时间" prop="operaTime">
+          <el-date-picker clearable
+            v-model="form.operaTime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-value="['00:00:00', '23:59:59']"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCommandLog, getCommandLog, delCommandLog, addCommandLog, updateCommandLog } from "@/api/ss/commandLog";
+import { $showColumns } from '@/utils/mixins';
+import {UserType} from "@/utils/constants";
+import UserLink from "@/components/Business/SmUser/UserLink.vue";
+
+// 默认排序字段
+const defaultSort = {
+  prop: "operaTime",
+  order: "descending"
+}
+
+export default {
+  name: "CommandLog",
+  components: {UserLink},
+  computed: {
+    UserType() {
+      return UserType
+    }
+  },
+  mixins: [$showColumns],
+  dicts: ['command_log_type', 'login_user_type'],
+  props: {
+    query: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      // 字段列表
+      columns: [
+        {key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
+        {key: 'operaTime', visible: true, label: '操作时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
+        {key: 'mac', visible: true, label: 'MAC号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'reason', visible: true, label: '原因', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'command', visible: true, label: '命令', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'result', visible: true, label: '结果', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'userType', visible: true, label: '操作人类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'userName', visible: true, label: '操作人名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+      ],
+      // 排序方式
+      orderSorts: ['ascending', 'descending', null],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 命令日志表格数据
+      commandLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      defaultSort,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderByColumn: defaultSort.prop,
+        isAsc: defaultSort.order,
+        id: null,
+        type: null,
+        mac: null,
+        reason: null,
+        command: null,
+        result: null,
+        userId: null,
+        userName: null,
+        userType: null,
+        operaTime: null,
+        operaTimeRange: []
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        type: [
+          { required: true, message: "类型不能为空", trigger: "change" }
+        ],
+        mac: [
+          { required: true, message: "MAC号不能为空", trigger: "blur" }
+        ],
+        operaTime: [
+          { required: true, message: "操作时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.query,
+    }
+
+    this.getList();
+  },
+  methods: {
+    /** 当排序按钮被点击时触发 **/
+    onSortChange(column) {
+      if (column.order == null) {
+        this.queryParams.orderByColumn = defaultSort.prop;
+        this.queryParams.isAsc = defaultSort.order;
+      } else {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+      }
+      this.getList();
+    },
+    /** 查询命令日志列表 */
+    getList() {
+      this.loading = true;
+      listCommandLog(this.queryParams).then(response => {
+        this.commandLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        type: null,
+        mac: null,
+        reason: null,
+        command: null,
+        result: null,
+        userId: null,
+        userName: null,
+        userType: null,
+        operaTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加命令日志";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCommandLog(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改命令日志";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCommandLog(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCommandLog(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除命令日志编号为"' + ids + '"的数据项？').then(function() {
+        return delCommandLog(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ss/commandLog/export', {
+        ...this.queryParams
+      }, `commandLog_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/system/device/detail.vue b/src/views/system/device/detail.vue
index 7646be3..a27b73a 100644
--- a/src/views/system/device/detail.vue
+++ b/src/views/system/device/detail.vue
@@ -154,6 +154,9 @@
           <el-tab-pane label="订单列表" :lazy="true">
             <recharge :query="{deviceId: deviceData.deviceId}" :view="views.device"/>
           </el-tab-pane>
+          <el-tab-pane label="命令日志" :lazy="true">
+            <command-log :query="{macList: macList}" :views="views.device"/>
+          </el-tab-pane>
           <el-tab-pane label="时长/电量变化" :lazy="true">
             <record-time :query="{deviceId: deviceData.deviceId}" view="device"/>
           </el-tab-pane>
@@ -227,12 +230,14 @@ import BindMchButton from '@/views/system/device/components/BindMchButton.vue'
 import BindAgentButton from '@/views/system/device/components/BindAgentButton.vue'
 import LineField from '@/components/LineField/index.vue'
 import DeviceSetWifiDialog from '@/views/system/device/components/DeviceSetWifiDialog.vue'
+import CommandLog from "@/views/ss/commandLog/index.vue";
 
 export default {
   name: 'Device/:deviceId',
   mixins: [$serviceType, $view],
   dicts: ['sm_device_status', 'sm_device_outage_way', 'sm_device_notice_way', 'sm_model_tag', 'sm_device_online_status', 'service_type', 'device_service_mode', 'time_unit', 'bonus_arrival_type'],
   components: {
+    CommandLog,
     DeviceSetWifiDialog,
     LineField,
     BindAgentButton,
@@ -270,6 +275,16 @@ export default {
     }
   },
   computed: {
+    macList() {
+      let list = [];
+      if (!isEmpty(this.deviceData.mac)) {
+        list.push(this.deviceData.mac)
+      }
+      if (!isEmpty(this.deviceData.mac2)) {
+        list.push(this.deviceData.mac2);
+      }
+      return list;
+    },
     DeviceOnlineStatus() {
       return DeviceOnlineStatus
     },