diff --git a/sgzb-ui/src/api/inventoryLogs/index.js b/sgzb-ui/src/api/inventoryLogs/index.js
index 6af406f2..7cec71df 100644
--- a/sgzb-ui/src/api/inventoryLogs/index.js
+++ b/sgzb-ui/src/api/inventoryLogs/index.js
@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+
+/* 日志列表 */
 export const getLogsListApi = (data) => {
-    return request.post('/login', data)
+    return request.get('/bm_num_logs/list', data)
+}
+
+/* 日志详情 */
+export const getLogsDetailsApi = (id) => {
+    return request.get(`/bm_num_logs/selectByPrimaryKey/${id}`)
 }
\ No newline at end of file
diff --git a/sgzb-ui/src/views/base/unit/index.vue b/sgzb-ui/src/views/base/unit/index.vue
index 8b72f68b..ae96c4a3 100644
--- a/sgzb-ui/src/views/base/unit/index.vue
+++ b/sgzb-ui/src/views/base/unit/index.vue
@@ -117,14 +117,6 @@
       @pagination="getList"
     />
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog
       :title="title"
diff --git a/sgzb-ui/src/views/inventoryLogs/index.vue b/sgzb-ui/src/views/inventoryLogs/index.vue
index 23f4f4ee..f811a507 100644
--- a/sgzb-ui/src/views/inventoryLogs/index.vue
+++ b/sgzb-ui/src/views/inventoryLogs/index.vue
@@ -1,151 +1,195 @@
 <template>
-    <!-- 库存日志 -->
-    <div class="app-container">
-        <el-row>
-            <el-form
-                :model="queryParams"
-                ref="queryForm"
-                size="small"
-                :inline="true"
-            >
-                <el-form-item label="模块名称" prop="userName">
-                    <el-input
-                        placeholder="请输入模块名称"
-                        clearable
-                        style="width: 200px"
-                        @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
-                <el-form-item label="请求方式" prop="phonenumber">
-                    <el-input
-                        placeholder="请输入请求方式"
-                        clearable
-                        style="width: 200px"
-                        @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
-                <el-form-item label="创建人" prop="status">
-                    <el-select
-                        placeholder="创建人"
-                        clearable
-                        filterable
-                        style="width: 200px"
-                    >
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="请求时间">
-                    <el-date-picker
-                        style="width: 200px"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="-"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                    ></el-date-picker>
-                </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>
+  <!-- 库存日志 -->
+  <div class="app-container">
+    <el-row>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+        <el-form-item label="模块名称" prop="userName">
+          <el-input
+            placeholder="请输入模块名称"
+            clearable
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="请求方式" prop="phonenumber">
+          <el-input
+            placeholder="请输入请求方式"
+            clearable
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="创建人" prop="status">
+          <el-select
+            placeholder="创建人"
+            clearable
+            filterable
+            style="width: 200px"
+          >
+          </el-select>
+        </el-form-item>
+        <el-form-item label="请求时间">
+          <el-date-picker
+            style="width: 200px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </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>
 
-        <el-table :data="tableList" border>
-            <el-table-column
-                align="center"
-                label="序号"
-                type="index"
-                width="60"
-            />
-            <el-table-column align="center" prop="title" label="模块名称" />
-            <el-table-column align="center" prop="title" label="请求方式" />
-            <el-table-column align="center" prop="title" label="实例" />
-            <el-table-column align="center" prop="v_name" label="机具名称" />
-            <el-table-column align="center" prop="title" label="机具规格" />
-            <el-table-column align="center" prop="title" label="描述" />
-            <el-table-column align="center" prop="title" label="响应内容" />
-            <el-table-column align="center" prop="title" label="请求时间" />
-            <el-table-column align="center" prop="title1" label="创建人" />
-            <el-table-column align="center" prop="title" label="备注" />
-            <el-table-column align="center" label="操作">
-                <template slot-scope="{ row }">
-                    <el-button size="mini" type="text">查询</el-button>
-                    <el-button size="mini" type="text" style="color: #f56c6c"
-                        >删除</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
+    <el-table :data="tableList" border>
+      <el-table-column align="center" label="序号" type="index" width="60" />
+      <el-table-column align="center" prop="modelTitle" label="模块名称" />
+      <el-table-column align="center" prop="method" label="请求方式" />
+      <el-table-column align="center" prop="task" label="实例" />
+      <el-table-column align="center" prop="id" label="机具名称" />
+      <el-table-column align="center" prop="typeId" label="机具规格" />
+      <el-table-column align="center" prop="description" label="描述" />
+      <el-table-column align="center" prop="time" label="日期" />
+      <el-table-column align="center" label="状态">
+        <template slot-scope="{ row }">
+          <el-tag size="mini" type="success" v-if="row.status == 0"
+            >正常</el-tag
+          >
+          <el-tag size="mini" type="warning" v-else>异常</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="creator" label="创建人" />
+      <el-table-column align="center" prop="remark" label="备注" />
+      <el-table-column align="center" label="操作">
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="text" @click="previewLogsDetails(row.id)"
+            >详情</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"
-        />
-    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 详情弹框 -->
+    <el-dialog
+      title="日志详情"
+      :visible.sync="logsDetailsDialogVisible"
+      width="60%"
+    >
+      <el-descriptions
+        class="margin-top"
+        :column="3"
+        size="medium"
+        border
+        :labelStyle="commonStyle"
+        :contentStyle="commonStyle"
+      >
+        <el-descriptions-item v-for="(item, v) in detailsLabelList" :key="v">
+          <template slot="label"> {{ item.label }} </template>
+          {{ logsDetailsInfoDemo[item.content] || "" }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-    import { getLogsListApi } from '@/api/inventoryLogs'
-    export default {
-        name: 'myInventoryLogs',
-        data() {
-            return {
-                tableList: [
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                    { title: '12', methods: 'post', v_name: '机具' },
-                ],
-                total: 5,
-                queryParams: {
-                    pageNum: 5,
-                    pageSize: 1,
-                },
-            }
-        },
-        methods: {
-            /* 查询列表 */
-            async getList() {
-                const res = await getLogsListApi(this.queryParams)
-                console.log(res, '日志列表')
-            },
-            /* 搜索按钮操作 */
-            handleQuery() {
-                this.getList()
-            },
-            /* 重置按钮操作 */
-            resetQuery() {
-                this.resetForm('queryForm')
-                this.getList()
-            },
-        },
-        created() {
-            this.getList()
-        },
-    }
+import { getLogsListApi, getLogsDetailsApi } from "@/api/inventoryLogs";
+export default {
+  name: "myInventoryLogs",
+  data() {
+    return {
+      queryParams: {
+        pageNum: 5,
+        pageSize: 1,
+      },
+      tableList: [{ id: 1 }, { id: 2 }],
+      total: 5,
+      logsDetailsInfo: null /* 日志详情 */,
+      logsDetailsDialogVisible: false,
+      commonStyle: {
+        "text-align": "center",
+      },
+      /* 日志详情label以及内容 */
+      detailsLabelList: [
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+        { label: "占位", content: "vdDemo" },
+      ],
+      logsDetailsInfoDemo: {
+        vdDemo: "123",
+      },
+    };
+  },
+  methods: {
+    /* 查询列表 */
+    async getList() {
+      const { data: res } = await getLogsListApi();
+      this.tableList = res.rows;
+      this.total = res.total;
+      console.log(res, "=======日志列表");
+    },
+    /* 搜索按钮 */
+    handleQuery() {
+      this.getList();
+    },
+    /* 重置按钮 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.getList();
+    },
+    /* 查看详情 */
+    async previewLogsDetails(id) {
+      // const { data: res } = await getLogsDetailsApi(id)
+      // console.log(res, '=======日志详情')
+
+      this.logsDetailsDialogVisible = true;
+      // this.logsDetailsInfo = res
+    },
+  },
+  created() {
+    this.getList();
+  },
+};
 </script>
 
 <style scoped>
-    .el-table :empty::before {
-        content: '-';
-        color: gray;
-    }
+.el-table :empty::before {
+  content: "-";
+  color: gray;
+}
+.margin-top {
+  margin-top: -15px;
+}
 </style>