diff --git a/src/views/assets/assetsHistory.vue b/src/views/assets/assetsHistory.vue
index f20a2fe..7a414de 100644
--- a/src/views/assets/assetsHistory.vue
+++ b/src/views/assets/assetsHistory.vue
@@ -15,16 +15,16 @@
           label-position="right"
         >
           <el-form-item prop="riqi" label="日期" required>
-            <el-date-picker v-model="form.riqi"></el-date-picker>
+            <el-date-picker v-model="form.riqi" placeholder="请选择日期" value-format="yyyy-MM-dd"></el-date-picker>
           </el-form-item>
           <el-form-item prop="neirong" label="内容">
             <my-tinymce v-model="form.neirong"></my-tinymce>
           </el-form-item>
-          <el-form-item prop="tupian" label="图片">
+          <el-form-item prop="id_his_tupian_files_asset_history_id_relation" label="图片">
             <el-upload
               ref="upload"
               :action="action"
-              :file-list="tupian"
+              :file-list="fileList"
               :headers="{
                 Authorization: `Bearer ${getToken()}`,
               }"
@@ -66,9 +66,9 @@ export default {
       form: {
         riqi: "",
         neirong: "",
-        tupian: "",
+        id_his_tupian_files_asset_history_id_relation: "",
       },
-      tupian: [],
+      fileList: [],
     };
   },
   methods: {
@@ -112,8 +112,26 @@ export default {
     },
 
     submit () {
-      let promiseAll = [];
-
+      this.form.id_his_tupian_files_asset_history_id_relation = this.fileList.map(i => {
+        return {
+          original_name: i.response.original_name,
+          name: i.response.name,
+          url: i.response.url,
+          file_id: i.response.id
+        }
+      })
+      save({
+        table_name: "asset_histories",
+        asset_id: this.asset_id,
+        ...this.form
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '新增资产历史成功'
+        })
+        this.hide()
+        this.init()
+      })
     }
   },
   computed: {},
diff --git a/src/views/component/detail.vue b/src/views/component/detail.vue
index 599b63b..8b47f2d 100644
--- a/src/views/component/detail.vue
+++ b/src/views/component/detail.vue
@@ -39,18 +39,14 @@
       <el-col :span="10" >
         <el-card>
           <div class="el-descriptions__header el-descriptions__title">资产历史</div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in activities"
-              :key="index"
-              :icon="activity.icon"
-              :type="activity.type"
-              :color="activity.color"
-              :size="activity.size"
-              :timestamp="activity.timestamp">
-              {{activity.content}}
-            </el-timeline-item>
-          </el-timeline>
+          <Timeline>
+            <TimelineItem v-for="(item,index) in histories" :key="item.id">
+              <p>{{ item.riqi }}</p>
+              <div v-html="item.neirong"></div>
+              <el-image style="width: 78%;height: 160px;" v-for="img in item.id_his_tupian_files_asset_history_id_relation" :src="img.url" fit="contain"></el-image>
+            </TimelineItem>
+
+          </Timeline>
         </el-card>
       </el-col>
     </el-row>
@@ -58,13 +54,14 @@
 </template>
 
 <script>
-import { show } from "@/api/system/baseForm"
+import { show, index } from "@/api/system/baseForm";
 import { show as formShow } from "@/api/system/customForm";
 import { getparameter } from '@/api/system/dictionary'
 import { listdept } from '@/api/system/department'
 export default {
   data() {
     return {
+      histories: [],
       picList: [],
       detail: {},
       fields: [],
@@ -74,24 +71,7 @@ export default {
         tableName: "",
       },
 
-      activities: [{
-        content: '支持使用图标',
-        timestamp: '2018-04-12 20:46',
-        size: 'large',
-        type: 'primary',
-        icon: 'el-icon-more'
-      }, {
-        content: '支持自定义颜色',
-        timestamp: '2018-04-03 20:46',
-        color: '#0bbd87'
-      }, {
-        content: '支持自定义尺寸',
-        timestamp: '2018-04-03 20:46',
-        size: 'large'
-      }, {
-        content: '默认样式的节点',
-        timestamp: '2018-04-03 20:46'
-      }]
+
     }
   },
   methods: {
@@ -180,6 +160,22 @@ export default {
       this.detail = detail
 
       this.picList = detail?.id_assets_picture_files_file_id_relation?.map(i => i.url)
+    },
+
+    async getHistory () {
+      const res = await index({
+        page: 1,
+        page_size: 999,
+        table_name: "asset_histories",
+        filter: [
+          {
+            key: 'asset_id',
+            op: 'eq',
+            value: this.detail.id
+          }
+        ]
+      })
+      this.histories = res.data
     }
   },
   computed: {
@@ -211,7 +207,9 @@ export default {
     }
   },
   created() {
-    this.getFields()
+    this.getFields().then(res => {
+      this.getHistory()
+    })
   }
 }
 </script>
diff --git a/src/views/component/table.vue b/src/views/component/table.vue
index b67f58b..140a293 100644
--- a/src/views/component/table.vue
+++ b/src/views/component/table.vue
@@ -264,7 +264,7 @@
         }
       "
     >
-      <template #assetsHistory="row">
+      <template #assetsHistory="{row}">
         <Button
           size="small"
           type="primary"