diff --git a/src/utils/createDialog.js b/src/utils/createDialog.js
new file mode 100644
index 0000000..629a154
--- /dev/null
+++ b/src/utils/createDialog.js
@@ -0,0 +1,377 @@
+import { domMap } from '@/const/inputType'
+import { addPropsMap } from '@/const/addProps'
+
+export class CreateDialog {
+  replaces
+  self
+  $createElement
+  options
+  constructor (self, replaces = [], options) {
+    /*
+      replace = [
+        {
+          key: '',
+          label: '',
+          render: () => {}
+        }
+      ]
+     */
+    this.self = self
+    this.$createElement = self.$createElement
+    this.replaces = replaces
+    this.options = options
+  }
+  getEventType (info) {
+    if (info === "checkbox") {
+      return "change";
+    }
+    return "input";
+  }
+  fileRemoveHandler(file, field) {
+    let that = this.self
+    that.file[field] = that.file[field].filter((item) => item !== file);
+    that.file = Object.assign({}, that.file);
+  }
+  extraProps (info) {
+    let that = this.self
+    let props = {};
+    if (info.edit_input === "file" || info.edit_input === "files") {
+      props.fileList = that.file[info.field];
+      props.beforeUpload = (file) => {
+        if (file.size / 1000 > 500) {
+          that.$message({
+            type: "warning",
+            message: "上传图片大小超过500kb！",
+          });
+          return false;
+        }
+      };
+
+      props.onSuccess = (response, file, fileList) => {
+        that.file[info.field] = fileList;
+      };
+
+      props.onRemove = (file, fileList) => {
+        that.file[info.field] = fileList;
+      };
+
+      props.onError = (err, file, fileList) => {
+        that.file[info.field] = fileList;
+        that.$message({
+          type: "warning",
+          message: err,
+        });
+      };
+    }
+    return props;
+  }
+  optionsRender(h, info) {
+    let that = this.self
+    if (info.edit_input === "checkbox" || info.edit_input === "radio") {
+      return info._params && info._params instanceof Array
+        ? info._params.map((i) =>
+          h("el-option", {
+            props: {
+              label:
+                i.name ||
+                i.mingcheng ||
+                i.label ||
+                i.key ||
+                i.value ||
+                i.id ||
+                i.no,
+              value: i.id || i.value,
+            },
+          })
+        )
+        : [];
+    }
+    if (info.edit_input === "file" || info.edit_input === "files") {
+      return [
+        h(
+          "el-button",
+          {
+            slot: "trigger",
+            props: {
+              size: "small",
+              type: "primary",
+            },
+          },
+          "选取文件"
+        ),
+        h(
+          "el-button",
+          {
+            style: {
+              "margin-left": "10px",
+            },
+            props: {
+              size: "small",
+              type: "success",
+            },
+            on: {
+              ["click"]: (e) => {
+                that.$refs[`elEdit_${info.field}`].submit();
+              },
+            },
+          },
+          "上传到服务器"
+        ),
+        h(
+          "div",
+          {
+            class: "el-upload__tip",
+            slot: "tip",
+          },
+          "文件不超过500kb"
+        ),
+      ];
+    }
+  }
+  render () {
+    let that = this.self
+    const h = this.$createElement
+
+    return h(
+      "el-dialog",
+      {
+        props: {
+          top: "8vh",
+          title: "新增",
+          visible: that.dialogVisible,
+          width: this.options?.width ? this.options.width : "800px",
+        },
+        on: {
+          "update:visible": (val) => {
+            that.dialogVisible = val;
+          },
+        },
+      },
+      [
+        h(
+          "el-scrollbar",
+          {
+            style: {
+              height: "58vh",
+            },
+          },
+          [
+            h(
+              "el-form",
+              {
+                class: "form-body",
+                ref: "elForm",
+                style: {
+                  "padding-right": "12px",
+                },
+                props: {
+                  model: that.form,
+                  labelWidth: "80px",
+                  rules: that.rules,
+                  labelPosition: "right",
+                  size: "small",
+                },
+              },
+              (() => {
+                let dom = [];
+                (this.options?.formInfo ? this.options.formInfo : that.formInfo)
+                  .filter((i) => i.form_show)
+                  .forEach((i, index) => {
+                    let replace = this.replaces.find(j => j.key === i.field)
+                    if (replace && replace.render) {
+                      dom.push(replace.render)
+                    } else {
+                      dom.push(
+                        h(
+                          "el-form-item",
+                          {
+                            ref: `elFormItem${i.field}`,
+                            style: {
+                              width: "100%",
+                            },
+                            props: {
+                              label: i.name,
+                              prop: i.field,
+                              required:
+                                i.validation instanceof Array
+                                  ? !!i.validation.find((i) => i === "required")
+                                  : false,
+                            },
+                          },
+                          that.$scopedSlots[i.field]
+                            ? that.$scopedSlots[i.field]({
+                              fieldInfo: i,
+                              form: that.form,
+                              file: that.file,
+                            })
+                            : [
+                              h(
+                                domMap.get(i.edit_input),
+                                {
+                                  ref: `elEdit_${i.field}`,
+                                  style: {
+                                    width: "100%",
+                                  },
+                                  props: {
+                                    ...addPropsMap.get(i.edit_input),
+                                    ...this.extraProps(i),
+                                    placeholder: i.help,
+                                    value: that.form[i.field],
+                                  },
+                                  attrs: {
+                                    placeholder: i.help || `请填写${i.name}`,
+                                  },
+                                  on: {
+                                    [this.getEventType(i.edit_input)]: (
+                                      e
+                                    ) => {
+                                      if (i.field) {
+                                        that.form[i.field] = e;
+                                        that.form = Object.assign(
+                                          {},
+                                          that.form
+                                        );
+                                      }
+                                    },
+                                  },
+                                  scopedSlots:
+                                    i.edit_input === "file" ||
+                                    i.edit_input === "files"
+                                      ? {
+                                        file: (scope) => {
+                                          let { file } = scope;
+                                          return [
+                                            h("div", {}, [
+                                              h("i", {
+                                                class: {
+                                                  "el-icon-circle-check":
+                                                    file.status ===
+                                                    "success",
+                                                  "el-icon-loading":
+                                                    file.status ===
+                                                    "uploading",
+                                                },
+                                                style: {
+                                                  color:
+                                                    file.status ===
+                                                    "success"
+                                                      ? "green"
+                                                      : "",
+                                                },
+                                              }),
+                                              h(
+                                                "a",
+                                                {
+                                                  attrs: {
+                                                    href: file.url,
+                                                    download: file.name,
+                                                  },
+                                                  class: {
+                                                    "uploaded-a":
+                                                      file.status ===
+                                                      "success",
+                                                  },
+                                                  style: {
+                                                    padding: "0 4px",
+                                                  },
+                                                },
+                                                file.name
+                                              ),
+                                            ]),
+                                            h("i", {
+                                              class: "el-icon-close",
+                                              on: {
+                                                ["click"]: () =>
+                                                  this.fileRemoveHandler(
+                                                    file,
+                                                    i.field
+                                                  ),
+                                              },
+                                            }),
+                                          ];
+                                        },
+                                      }
+                                      : "",
+                                },
+                                this.optionsRender(h, i)
+                              ),
+                            ]
+                        )
+                      );
+                    }
+                  });
+
+                this.replaces.forEach(replace => {
+                  let info = that.formInfo.find(i => i.field === replace.key)
+                  if (!info) {
+                    if (replace.label) {
+                      dom.push(h(
+                        "el-form-item",
+                        {
+                          ref: `elFormItem${replace.key}`,
+                          style: {
+                            width: "100%",
+                          },
+                          props: {
+                            label: replace.label,
+                            prop: replace.key,
+                          },
+                        },
+                        [replace.render]
+                      ))
+                    } else {
+                      dom.push(replace.render)
+                    }
+
+                  }
+                })
+                return dom;
+              })()
+            ),
+          ]
+        ),
+        h("template", { slot: "footer" }, [
+          h(
+            "el-button",
+            {
+              props: {
+                size: "mini"
+              },
+              on: {
+                click: () => (that.dialogVisible = false),
+              },
+            },
+            "取 消"
+          ),
+          h(
+            "el-button",
+            {
+              props: {
+                type: "warning",
+                plain: true,
+                size: 'mini'
+              },
+              on: {
+                click: () => that.init(),
+              },
+            },
+            "重 置"
+          ),
+          h(
+            "el-button",
+            {
+              props: {
+                type: "primary",
+                size: 'mini'
+              },
+              on: {
+                click: that.submit,
+              },
+            },
+            "确 定"
+          ),
+        ]),
+      ]
+    );
+  }
+}
diff --git a/src/utils/createTable.js b/src/utils/createTable.js
new file mode 100644
index 0000000..f1cc9f1
--- /dev/null
+++ b/src/utils/createTable.js
@@ -0,0 +1,74 @@
+import { show } from "@/api/system/customForm";
+import { listdept } from "@/api/system/department";
+import { getparameter } from "@/api/system/dictionary";
+
+export async function resolveFormInfo(customFormId) {
+  const res = await show({ id: customFormId }, false);
+
+  //字段处理
+  //初始表白名单
+  let baseTable = new Map([
+    [
+      "departments",
+      async () => {
+        const res = await listdept();
+        return res;
+      },
+    ],
+    ["admins", []],
+  ]);
+  let { fields, relation } = res;
+  let fieldRes = fields.sort((a, b) => a.sort - b.sort);
+  if (
+    !fields ||
+    !relation ||
+    !fields instanceof Array ||
+    !relation instanceof Array
+  ) {
+    throw new Error("fields或relation格式错误");
+  }
+  fieldRes?.forEach((i, index) => {
+    i._relations = relation.find(
+      (j) => j.link_table_name.split("_")[1] === i.field
+    );
+    if (i.select_item && typeof i.select_item === "object") {
+      let keys = Object.keys(i.select_item);
+      i._params = keys.map((key) => {
+        return {
+          key,
+          value: /^\d*$/.test(i.select_item[key])
+            ? Number(i.select_item[key])
+            : i.select_item[key],
+        };
+      });
+    }
+    if (i.edit_input === "file" || i.edit_input === "files") {
+      return;
+    }
+    if (i._relations) {
+      if (baseTable.get(i._relations.link_table_name)) {
+        baseTable
+          .get(i._relations.link_table_name)()
+          .then((res) => {
+            i._params = res.data;
+          });
+      } else {
+        i._params = i._relations.parameter_id
+          ? getparameter({ id: i._relations.parameter_id }, false).then(
+              (res) => {
+                i._params = res.detail;
+              }
+            )
+          : this.index({
+              table_name: i._relations.link_table_name,
+              page: 1,
+              page_size: 9999,
+            }).then((res) => {
+              i._params = res.data;
+            });
+      }
+    }
+  });
+
+  return fieldRes;
+}
diff --git a/src/views/assets/component/addHistory.vue b/src/views/assets/component/addHistory.vue
new file mode 100644
index 0000000..383bd33
--- /dev/null
+++ b/src/views/assets/component/addHistory.vue
@@ -0,0 +1,207 @@
+<script>
+import { save, show, index, destroy } from "@/api/system/baseForm";
+import { CreateDialog } from "@/utils/createDialog"
+import { deepCopy } from "@/utils";
+import { resolveFormInfo } from '@/utils/createTable'
+export default {
+  props: {
+    tableName: String,
+  },
+  render(h) {
+    let dialog = new CreateDialog(this,[
+      {
+        key: 'landArea',
+        label: '土地面积',
+        render: h('span', this.row.shijimianji)
+      },
+      {
+        key: 'houseArea',
+        label: '房产日期',
+        render: h('span', this.row.dengjishijian)
+      },
+      {
+        key: 'tudixingzhi',
+        label: '土地性质',
+        render: h('span','')
+      },
+      {
+        key: 'tudiyongtu',
+        label: '土地/房产用途',
+        render: h('span', this.row.yongtu)
+      }
+    ],{
+      width: "650px"
+    })
+    return dialog.render()
+  },
+  data() {
+    return {
+      row: {},
+      formInfo: [],
+      id: "",
+      type: "add",
+      dialogVisible: false,
+      form: {},
+      originalForm: {},
+      rules: {},
+      file: {},
+    };
+  },
+  methods: {
+    setRow (row) {
+      this.row = row
+    },
+    init() {
+      for (let key in this.form) {
+        if (this.form[key] instanceof Array) {
+          this.form[key] = [];
+        } else {
+          this.form[key] = "";
+        }
+      }
+      this.$refs["elForm"].clearValidate();
+    },
+    show() {
+      this.dialogVisible = true;
+    },
+    hidden() {
+      this.dialogVisible = false;
+    },
+    setType(type = "add") {
+      let types = ["add", "editor"];
+      if (types.includes(type)) {
+        this.type = type;
+      } else {
+        console.warn("Unknown type: " + type);
+      }
+    },
+    setId(id) {
+      if (typeof id == "number") {
+        this.id = id;
+      } else {
+        console.error("error typeof id: " + typeof id);
+      }
+    },
+
+    async getDetail() {
+      const res = await show({ id: this.id, table_name: this.tableName });
+      this.$integrateData(this.form, res);
+
+      this.formInfo.forEach((i) => {
+        if (i && (i.edit_input === "file" || i.edit_input === "files")) {
+          res[i._relations.link_with_name]
+            ? (this.file[i.field] =
+              res[i._relations.link_with_name] instanceof Array
+                ? res[i._relations.link_with_name].map((i) => {
+                  return {
+                    name: i?.name,
+                    url: i?.url,
+                    response: i,
+                  };
+                })
+                : [
+                  {
+                    name: res[i._relations.link_with_name]?.name,
+                    url: res[i._relations.link_with_name]?.url,
+                    response: res[i._relations.link_with_name],
+                  },
+                ])
+            : (this.file[i.field] = []);
+        }
+
+        this.form = Object.assign({}, this.form);
+        this.originalForm = deepCopy(res);
+      });
+    },
+
+    submit() {
+      console.log(this.form)
+    },
+  },
+  computed: {},
+  watch: {
+    formInfo: {
+      handler: function (newVal) {
+        this.form = {};
+        this.rules = {};
+        this.file = {};
+        newVal.forEach((i) => {
+          if (i.field) {
+            this.form[i.field] = "";
+            if (
+              i.validation instanceof Array &&
+              i.validation.length > 0 &&
+              !!i.validation.find((i) => i === "required")
+            ) {
+              this.rules[i.field] = [
+                { required: true, message: `请填写${i.name}` },
+              ];
+            }
+            if (i.edit_input === "files") {
+              this.form[i.field] = [];
+            }
+            if (i.edit_input === "files" || i.edit_input === "file") {
+              this.file[i.field] = [];
+            }
+            if (i.edit_input === "checkbox") {
+              this.form[i.field] = [];
+            }
+            if (i._relations) {
+              this.form[i._relations?.link_with_name] = [];
+            }
+          }
+        });
+
+        document.documentElement.style.setProperty(
+          "--column-num",
+          newVal.length > 11 ? '2' : '1'
+        );
+      },
+      //immediate: true,
+    },
+    dialogVisible(val) {
+      if (val) {
+        if (this.type === "editor") {
+          this.$nextTick(() => this.getDetail());
+        }
+      } else {
+        this.id = "";
+        this.type = "";
+        this.init();
+        this.$refs["elForm"].clearValidate();
+        delete this.form.id;
+        for (let key in this.file) {
+          this.file[key] = [];
+        }
+      }
+    },
+  },
+  created() {
+     resolveFormInfo(14).then(res => this.formInfo = res)
+  }
+};
+</script>
+
+<style>
+:root {
+  --column-num: 2;
+}
+</style>
+<style scoped lang="scss">
+.uploaded-a {
+  color: red;
+  text-decoration: none;
+  transition: all 0.2s;
+}
+
+.uploaded-a:hover {
+  color: red;
+  text-decoration: underline;
+}
+
+.form-body {
+  display: grid;
+  grid-gap: 10px;
+  grid-template-columns: repeat(var(--column-num), 1fr);
+}
+</style>
diff --git a/src/views/assets/component/addHouse.vue b/src/views/assets/component/addHouse.vue
new file mode 100644
index 0000000..b364efd
--- /dev/null
+++ b/src/views/assets/component/addHouse.vue
@@ -0,0 +1,305 @@
+<script>
+import { save, show, index, destroy } from "@/api/system/baseForm";
+import { CreateDialog } from "@/utils/createDialog"
+import { deepCopy } from "@/utils";
+export default {
+  props: {
+    formInfo: {
+      type: Array,
+      default: () => [],
+    },
+    tableName: String,
+  },
+  render(h) {
+    let houseDialog = new CreateDialog(this)
+
+    return h('div',[
+      houseDialog.render()
+    ])
+  },
+  data() {
+    return {
+      id: "",
+      type: "add",
+      dialogVisible: false,
+      form: {},
+      originalForm: {},
+      rules: {},
+      file: {},
+    };
+  },
+  methods: {
+    init() {
+      for (let key in this.form) {
+        if (this.form[key] instanceof Array) {
+          this.form[key] = [];
+        } else {
+          this.form[key] = "";
+        }
+      }
+      this.$refs["elForm"].clearValidate();
+    },
+    show() {
+      this.dialogVisible = true;
+    },
+    hidden() {
+      this.dialogVisible = false;
+    },
+    setType(type = "add") {
+      let types = ["add", "editor"];
+      if (types.includes(type)) {
+        this.type = type;
+      } else {
+        console.warn("Unknown type: " + type);
+      }
+    },
+    setId(id) {
+      if (typeof id == "number") {
+        this.id = id;
+      } else {
+        console.error("error typeof id: " + typeof id);
+      }
+    },
+
+    async getDetail() {
+      const res = await show({ id: this.id, table_name: this.tableName });
+      this.$integrateData(this.form, res);
+
+      this.formInfo.forEach((i) => {
+        if (i && (i.edit_input === "file" || i.edit_input === "files")) {
+          res[i._relations.link_with_name]
+            ? (this.file[i.field] =
+              res[i._relations.link_with_name] instanceof Array
+                ? res[i._relations.link_with_name].map((i) => {
+                  return {
+                    name: i?.name,
+                    url: i?.url,
+                    response: i,
+                  };
+                })
+                : [
+                  {
+                    name: res[i._relations.link_with_name]?.name,
+                    url: res[i._relations.link_with_name]?.url,
+                    response: res[i._relations.link_with_name],
+                  },
+                ])
+            : (this.file[i.field] = []);
+        }
+
+        this.form = Object.assign({}, this.form);
+        this.originalForm = deepCopy(res);
+      });
+    },
+
+    submit() {
+      let promiseAll = [];
+      if (this.type === "add") {
+        if (this.form.hasOwnProperty("id")) {
+          delete this.form.id;
+        }
+      }
+      if (this.type === "editor") {
+        Object.defineProperty(this.form, "id", {
+          value: this.id,
+          enumerable: true,
+          configurable: true,
+          writable: true,
+        });
+      }
+      this.$refs["elForm"].validate((validate) => {
+        if (validate) {
+          let copyForm = deepCopy(this.form);
+          this.formInfo.forEach((info) => {
+            if (
+              info._relations?.link_relation === "newHasMany" ||
+              info._relations?.link_relation === "hasMany"
+            ) {
+              if (this.originalForm[info._relations.link_with_name]) {
+                this.originalForm[info._relations.link_with_name].map((i) => {
+                  promiseAll.push(
+                    destroy({
+                      id: i.id,
+                      table_name: info._relations.link_table_name,
+                    })
+                  );
+                });
+              }
+            }
+
+            if (copyForm[info._relations?.link_with_name]?.length > 0) {
+              delete copyForm[info.field];
+            }
+            if (
+              info._relations?.link_relation === "newHasMany" ||
+              info._relations?.link_relation === "hasMany"
+            ) {
+              if (info.edit_input === "files") {
+                copyForm[info._relations.link_with_name] = this.file[
+                  info.field
+                  ]?.map((i) => {
+                  let copyRelation = i?.response ? deepCopy(i?.response) : "";
+                  delete copyRelation.id;
+                  return {
+                    upload_id: i?.response?.id,
+                    ...copyRelation,
+                  };
+                });
+              } else {
+                copyForm[info._relations.link_with_name] = copyForm[
+                  info.field
+                  ]?.map((i) => {
+                  let copyRelation = info._params.find(
+                    (param) => param[info._relations?.foreign_key] === i
+                  )
+                    ? deepCopy(
+                      info._params.find(
+                        (param) => param[info._relations?.foreign_key] === i
+                      )
+                    )
+                    : "";
+                  delete copyRelation.id;
+                  return {
+                    [info._relations.foreign_key]: i,
+                    ...copyRelation,
+                  };
+                });
+              }
+
+              delete copyForm[info.field];
+            }
+            if (
+              info._relations?.link_relation === "newHasOne" ||
+              info._relations?.link_relation === "hasOne"
+            ) {
+              if (info.edit_input === "file") {
+                copyForm[info._relations.link_with_name] = [
+                  {
+                    upload_id: this.file[info.field]?.response?.id,
+                    ...this.file[info.field],
+                  },
+                ];
+              } else {
+                let copyRelation = deepCopy(
+                  info._params.find(
+                    (param) => param.id == this.form[info.field]
+                  )
+                );
+                if (copyRelation) {
+                  delete copyRelation.id;
+                  copyForm[info._relations.link_with_name] = [
+                    {
+                      id: this.form[info._relations?.link_with_name]?.id,
+                      [info.field === "shenhebumen"
+                        ? "dept_id"
+                        : info._relations.foreign_key]: this.form[info.field],
+                      ...copyRelation,
+                    },
+                  ];
+                }
+              }
+
+              delete copyForm[info.field];
+            }
+            if (!copyForm[info._relations?.link_with_name]) {
+              delete copyForm[info._relations?.link_with_name];
+            }
+          });
+          promiseAll.push(
+            save(Object.assign(copyForm, { table_name: this.tableName }))
+          );
+          Promise.all(promiseAll).then((res) => {
+            this.$Message.success({
+              content: `${this.type === "add" ? "新增" : "编辑"}成功`,
+            });
+            this.$emit("refresh");
+            this.hidden();
+          });
+        }
+      });
+    },
+  },
+  computed: {},
+  watch: {
+    formInfo: {
+      handler: function (newVal) {
+        this.form = {};
+        this.rules = {};
+        this.file = {};
+        newVal.forEach((i) => {
+          if (i.field) {
+            this.form[i.field] = "";
+            if (
+              i.validation instanceof Array &&
+              i.validation.length > 0 &&
+              !!i.validation.find((i) => i === "required")
+            ) {
+              this.rules[i.field] = [
+                { required: true, message: `请填写${i.name}` },
+              ];
+            }
+            if (i.edit_input === "files") {
+              this.form[i.field] = [];
+            }
+            if (i.edit_input === "files" || i.edit_input === "file") {
+              this.file[i.field] = [];
+            }
+            if (i.edit_input === "checkbox") {
+              this.form[i.field] = [];
+            }
+            if (i._relations) {
+              this.form[i._relations?.link_with_name] = [];
+            }
+          }
+        });
+
+        document.documentElement.style.setProperty(
+          "--column-num",
+          newVal.length > 11 ? '2' : '1'
+        );
+      },
+      //immediate: true,
+    },
+    dialogVisible(val) {
+      if (val) {
+        if (this.type === "editor") {
+          this.$nextTick(() => this.getDetail());
+        }
+      } else {
+        this.id = "";
+        this.type = "";
+        this.init();
+        this.$refs["elForm"].clearValidate();
+        delete this.form.id;
+        for (let key in this.file) {
+          this.file[key] = [];
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style>
+:root {
+  --column-num: 2;
+}
+</style>
+<style scoped lang="scss">
+.uploaded-a {
+  color: red;
+  text-decoration: none;
+  transition: all 0.2s;
+}
+
+.uploaded-a:hover {
+  color: red;
+  text-decoration: underline;
+}
+
+.form-body {
+  display: grid;
+  grid-gap: 10px;
+  grid-template-columns: repeat(var(--column-num), 1fr);
+}
+</style>
diff --git a/src/views/assets/component/addLand.vue b/src/views/assets/component/addLand.vue
new file mode 100644
index 0000000..098796b
--- /dev/null
+++ b/src/views/assets/component/addLand.vue
@@ -0,0 +1,314 @@
+<script>
+import { save, show, index, destroy } from "@/api/system/baseForm";
+import { CreateDialog } from "@/utils/createDialog"
+import { deepCopy } from "@/utils";
+export default {
+  props: {
+    formInfo: {
+      type: Array,
+      default: () => [],
+    },
+    tableName: String,
+  },
+  render(h) {
+    let dialog = new CreateDialog(this,[
+      {
+        key: 'id_historical_evolutions_land_id_relation',
+        label: '历史沿革材料',
+        render: h('el-button',{
+          props: {
+            type: 'primary',
+            size: 'small',
+            icon: 'el-icon-plus'
+          }
+        }, '新增')
+      }
+    ])
+    return dialog.render()
+  },
+  data() {
+    return {
+      id: "",
+      type: "add",
+      dialogVisible: false,
+      form: {},
+      originalForm: {},
+      rules: {},
+      file: {},
+    };
+  },
+  methods: {
+    init() {
+      for (let key in this.form) {
+        if (this.form[key] instanceof Array) {
+          this.form[key] = [];
+        } else {
+          this.form[key] = "";
+        }
+      }
+      this.$refs["elForm"].clearValidate();
+    },
+    show() {
+      this.dialogVisible = true;
+    },
+    hidden() {
+      this.dialogVisible = false;
+    },
+    setType(type = "add") {
+      let types = ["add", "editor"];
+      if (types.includes(type)) {
+        this.type = type;
+      } else {
+        console.warn("Unknown type: " + type);
+      }
+    },
+    setId(id) {
+      if (typeof id == "number") {
+        this.id = id;
+      } else {
+        console.error("error typeof id: " + typeof id);
+      }
+    },
+
+    async getDetail() {
+      const res = await show({ id: this.id, table_name: this.tableName });
+      this.$integrateData(this.form, res);
+
+      this.formInfo.forEach((i) => {
+        if (i && (i.edit_input === "file" || i.edit_input === "files")) {
+          res[i._relations.link_with_name]
+            ? (this.file[i.field] =
+              res[i._relations.link_with_name] instanceof Array
+                ? res[i._relations.link_with_name].map((i) => {
+                  return {
+                    name: i?.name,
+                    url: i?.url,
+                    response: i,
+                  };
+                })
+                : [
+                  {
+                    name: res[i._relations.link_with_name]?.name,
+                    url: res[i._relations.link_with_name]?.url,
+                    response: res[i._relations.link_with_name],
+                  },
+                ])
+            : (this.file[i.field] = []);
+        }
+
+        this.form = Object.assign({}, this.form);
+        this.originalForm = deepCopy(res);
+      });
+    },
+
+    submit() {
+      let promiseAll = [];
+      if (this.type === "add") {
+        if (this.form.hasOwnProperty("id")) {
+          delete this.form.id;
+        }
+      }
+      if (this.type === "editor") {
+        Object.defineProperty(this.form, "id", {
+          value: this.id,
+          enumerable: true,
+          configurable: true,
+          writable: true,
+        });
+      }
+      this.$refs["elForm"].validate((validate) => {
+        if (validate) {
+          let copyForm = deepCopy(this.form);
+          this.formInfo.forEach((info) => {
+            if (
+              info._relations?.link_relation === "newHasMany" ||
+              info._relations?.link_relation === "hasMany"
+            ) {
+              if (this.originalForm[info._relations.link_with_name]) {
+                this.originalForm[info._relations.link_with_name].map((i) => {
+                  promiseAll.push(
+                    destroy({
+                      id: i.id,
+                      table_name: info._relations.link_table_name,
+                    })
+                  );
+                });
+              }
+            }
+
+            if (copyForm[info._relations?.link_with_name]?.length > 0) {
+              delete copyForm[info.field];
+            }
+            if (
+              info._relations?.link_relation === "newHasMany" ||
+              info._relations?.link_relation === "hasMany"
+            ) {
+              if (info.edit_input === "files") {
+                copyForm[info._relations.link_with_name] = this.file[
+                  info.field
+                  ]?.map((i) => {
+                  let copyRelation = i?.response ? deepCopy(i?.response) : "";
+                  delete copyRelation.id;
+                  return {
+                    upload_id: i?.response?.id,
+                    ...copyRelation,
+                  };
+                });
+              } else {
+                copyForm[info._relations.link_with_name] = copyForm[
+                  info.field
+                  ]?.map((i) => {
+                  let copyRelation = info._params.find(
+                    (param) => param[info._relations?.foreign_key] === i
+                  )
+                    ? deepCopy(
+                      info._params.find(
+                        (param) => param[info._relations?.foreign_key] === i
+                      )
+                    )
+                    : "";
+                  delete copyRelation.id;
+                  return {
+                    [info._relations.foreign_key]: i,
+                    ...copyRelation,
+                  };
+                });
+              }
+
+              delete copyForm[info.field];
+            }
+            if (
+              info._relations?.link_relation === "newHasOne" ||
+              info._relations?.link_relation === "hasOne"
+            ) {
+              if (info.edit_input === "file") {
+                copyForm[info._relations.link_with_name] = [
+                  {
+                    upload_id: this.file[info.field]?.response?.id,
+                    ...this.file[info.field],
+                  },
+                ];
+              } else {
+                let copyRelation = deepCopy(
+                  info._params.find(
+                    (param) => param.id == this.form[info.field]
+                  )
+                );
+                if (copyRelation) {
+                  delete copyRelation.id;
+                  copyForm[info._relations.link_with_name] = [
+                    {
+                      id: this.form[info._relations?.link_with_name]?.id,
+                      [info.field === "shenhebumen"
+                        ? "dept_id"
+                        : info._relations.foreign_key]: this.form[info.field],
+                      ...copyRelation,
+                    },
+                  ];
+                }
+              }
+
+              delete copyForm[info.field];
+            }
+            if (!copyForm[info._relations?.link_with_name]) {
+              delete copyForm[info._relations?.link_with_name];
+            }
+          });
+          promiseAll.push(
+            save(Object.assign(copyForm, { table_name: this.tableName }))
+          );
+          Promise.all(promiseAll).then((res) => {
+            this.$Message.success({
+              content: `${this.type === "add" ? "新增" : "编辑"}成功`,
+            });
+            this.$emit("refresh");
+            this.hidden();
+          });
+        }
+      });
+    },
+  },
+  computed: {},
+  watch: {
+    formInfo: {
+      handler: function (newVal) {
+        this.form = {};
+        this.rules = {};
+        this.file = {};
+        newVal.forEach((i) => {
+          if (i.field) {
+            this.form[i.field] = "";
+            if (
+              i.validation instanceof Array &&
+              i.validation.length > 0 &&
+              !!i.validation.find((i) => i === "required")
+            ) {
+              this.rules[i.field] = [
+                { required: true, message: `请填写${i.name}` },
+              ];
+            }
+            if (i.edit_input === "files") {
+              this.form[i.field] = [];
+            }
+            if (i.edit_input === "files" || i.edit_input === "file") {
+              this.file[i.field] = [];
+            }
+            if (i.edit_input === "checkbox") {
+              this.form[i.field] = [];
+            }
+            if (i._relations) {
+              this.form[i._relations?.link_with_name] = [];
+            }
+          }
+        });
+
+        document.documentElement.style.setProperty(
+          "--column-num",
+          newVal.length > 11 ? '2' : '1'
+        );
+      },
+      //immediate: true,
+    },
+    dialogVisible(val) {
+      if (val) {
+        if (this.type === "editor") {
+          this.$nextTick(() => this.getDetail());
+        }
+      } else {
+        this.id = "";
+        this.type = "";
+        this.init();
+        this.$refs["elForm"].clearValidate();
+        delete this.form.id;
+        for (let key in this.file) {
+          this.file[key] = [];
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style>
+:root {
+  --column-num: 2;
+}
+</style>
+<style scoped lang="scss">
+.uploaded-a {
+  color: red;
+  text-decoration: none;
+  transition: all 0.2s;
+}
+
+.uploaded-a:hover {
+  color: red;
+  text-decoration: underline;
+}
+
+.form-body {
+  display: grid;
+  grid-gap: 10px;
+  grid-template-columns: repeat(var(--column-num), 1fr);
+}
+</style>
diff --git a/src/views/assets/house.vue b/src/views/assets/house.vue
new file mode 100644
index 0000000..1d3cdfd
--- /dev/null
+++ b/src/views/assets/house.vue
@@ -0,0 +1,667 @@
+<template>
+  <div>
+    <!-- 查询配置 -->
+    <div>
+      <div ref="lxHeader">
+        <LxHeader
+          :icon="$route.meta.icon"
+          :text="$route.meta.title"
+          style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+        >
+          <div slot="content"></div>
+          <slot>
+            <header-content :auths="auths_auth_mixin">
+              <template #search>
+                <div style="display: flex">
+                  <Select
+                    v-model="select.filter[0].key"
+                    style="width: 100px"
+                    placeholder="搜索条目"
+                  >
+                    <Option
+                      v-for="item in form"
+                      :key="item.id"
+                      :value="item.field"
+                    >{{ item.name }}</Option
+                    >
+                  </Select>
+                  <Select
+                    v-model="select.filter[0].op"
+                    style="width: 100px; margin-left: 10px"
+                    placeholder="搜索条件"
+                  >
+                    <Option
+                      v-for="item in op"
+                      :key="item.value"
+                      :value="item.value"
+                    >{{ item.label }}</Option
+                    >
+                  </Select>
+                  <template
+                    v-if="
+                      select.filter[0].op !== 'range' &&
+                      !columnArrTest(select.filter[0].key)
+                    "
+                  >
+                    <Input
+                      v-model="select.filter[0].value"
+                      style="width: 150px; margin-left: 10px"
+                      placeholder="请填写关键词"
+                    />
+                  </template>
+                  <template
+                    v-else-if="
+                      select.filter[0].op !== 'range' &&
+                      columnArrTest(select.filter[0].key)
+                    "
+                  >
+                    <Select
+                      v-model="select.filter[0].value"
+                      style="width: 150px; margin-left: 10px"
+                      placeholder="请选择关键词"
+                    >
+                      <Option
+                        v-for="item in getColumnParams(select.filter[0].key)"
+                        :key="item.id"
+                        :value="getColumnField(select.filter[0].key)._relations ? item[getColumnField(select.filter[0].key)._relations.foreign_key] : item.value"
+                      >{{
+                          item.key || item.value || item.name || item.no || item.mingcheng || item.id
+                        }}</Option
+                      >
+                    </Select>
+                  </template>
+                  <template v-else>
+                    <Input
+                      :value="select.filter[0].value.split(',')[0]"
+                      style="width: 150px; margin-left: 10px"
+                      placeholder="范围开始关键词"
+                      @input="(e) => inputStartHandler(e, select.filter[0])"
+                    />
+                    <span
+                      style="
+                        margin-left: 10px;
+                        display: flex;
+                        align-items: center;
+                      "
+                    >至</span
+                    >
+                    <Input
+                      :value="select.filter[0].value.split(',')[1]"
+                      style="width: 150px; margin-left: 10px"
+                      placeholder="范围结束关键词"
+                      @input="(e) => inputEndHandler(e, select.filter[0])"
+                    />
+                  </template>
+                  <Button
+                    style="margin-left: 10px"
+                    type="primary"
+                    @click="$refs['xyTable'].getTableData(true)"
+                  >查询</Button
+                  >
+
+                  <xy-selectors
+                    style="margin-left: 10px"
+                    @reset="reset"
+                    @search="$refs['xyTable'].getTableData(true)"
+                  >
+                    <template>
+                      <div class="select">
+                        <div
+                          class="select__item"
+                          v-for="(item, index) in select.filter"
+                          :key="`${item.value}-${index}`"
+                        >
+                          <p>条件{{ index + 1 }}</p>
+                          <Select
+                            v-model="item.key"
+                            style="width: 100px"
+                            placeholder="搜索条目"
+                          >
+                            <Option
+                              v-for="item in form"
+                              :key="item.id"
+                              :value="item.field"
+                            >{{ item.name }}</Option
+                            >
+                          </Select>
+                          <Select
+                            v-model="item.op"
+                            style="width: 100px; margin-left: 10px"
+                            placeholder="搜索条件"
+                          >
+                            <Option
+                              v-for="item in op"
+                              :key="item.value"
+                              :value="item.value"
+                            >{{ item.label }}</Option
+                            >
+                          </Select>
+                          <template
+                            v-if="
+                              item.op !== 'range' && !columnArrTest(item.key)
+                            "
+                          >
+                            <Input
+                              v-model="item.value"
+                              style="width: 150px; margin-left: 10px"
+                              placeholder="请填写关键词"
+                            />
+                          </template>
+                          <template
+                            v-else-if="
+                              item.op !== 'range' && columnArrTest(item.key)
+                            "
+                          >
+                            <Select
+                              v-model="item.value"
+                              style="width: 150px; margin-left: 10px"
+                              placeholder="请选择关键词"
+                            >
+                              <Option
+                                v-for="item in getColumnParams(item.key)"
+                                :key="item.id"
+                                :value="getColumnField(item.key)._relations ? item[getColumnField(item.key)._relations.foreign_key] : item.value"
+                              >{{
+                                  item.key || item.value || item.name || item.no || item.mingcheng || item.id
+                                }}</Option
+                              >
+                            </Select>
+                          </template>
+                          <template v-else>
+                            <Input
+                              :value="item.value.split(',')[0]"
+                              style="width: 150px; margin-left: 10px"
+                              placeholder="范围开始关键词"
+                              @input="(e) => inputStartHandler(e, item)"
+                            />
+                            <span style="margin-left: 10px">至</span>
+                            <Input
+                              :value="item.value.split(',')[1]"
+                              style="width: 150px; margin-left: 10px"
+                              placeholder="范围结束关键词"
+                              @input="(e) => inputEndHandler(e, item)"
+                            />
+                          </template>
+                          <el-button
+                            v-if="index !== 0"
+                            size="small"
+                            type="danger"
+                            icon="el-icon-delete"
+                            circle
+                            style="margin-left: 10px"
+                            @click="select.filter.splice(index, 1)"
+                          ></el-button>
+                        </div>
+                      </div>
+                      <div class="add-btn">
+                        <el-button
+                          size="small"
+                          type="primary"
+                          icon="el-icon-plus"
+                          circle
+                          @click="
+                            select.filter.push({ key: '', op: '', value: '' })
+                          "
+                        ></el-button>
+                        <span>新增一条</span>
+                      </div>
+                    </template>
+                  </xy-selectors>
+                </div>
+              </template>
+              <template #create>
+                <Button
+                  type="primary"
+                  @click="
+                    $refs['dialog'].setType('add'), $refs['dialog'].show()
+                  "
+                >新增</Button
+                >
+              </template>
+              <template #import>
+                <Button type="primary" @click="$refs['imports'].show()"
+                >导入</Button
+                >
+              </template>
+              <template #export>
+                <Button
+                  type="primary"
+                  @click="exportExcel(new Date().getTime().toString())"
+                >导出</Button
+                >
+              </template>
+            </header-content>
+          </slot>
+        </LxHeader>
+      </div>
+    </div>
+
+    <xy-table
+      :btn-width="300"
+      :auths="auths_auth_mixin"
+      :delay-req="true"
+      :destroy-action="destroy"
+      ref="xyTable"
+      :border="true"
+      :action="index"
+      :req-opt="select"
+      :destroy-req-opt="select"
+      :table-item="table"
+      @detail="
+        (row) => {
+          $router.push({
+            path: '/assetsDetail',
+            query: {
+              id: row.id
+            }
+          })
+        }
+      "
+      @editor="
+        (row) => {
+          $refs['dialog'].setId(row.id);
+          $refs['dialog'].setType('editor');
+          $refs['dialog'].show();
+        }
+      "
+    >
+      <template #assetsHistory="{row}">
+        <Button
+          size="small"
+          type="primary"
+          @click="$refs['addHistory'].setRow(row),$refs['addHistory'].show()"
+        >历史沿革</Button
+        >
+      </template>
+
+      <template #picture="{row}">
+        <Button
+          size="small"
+          type="primary"
+          @click="$refs['atlas'].setId(row.id),$refs['atlas'].show()"
+        >图集</Button
+        >
+      </template>
+    </xy-table>
+
+    <add
+      :table-name="customForm.tableName"
+      :form-info="form"
+      ref="dialog"
+      @refresh="$refs['xyTable'].getTableData()"
+    >
+    </add>
+    <addHistory ref="addHistory"></addHistory>
+    <!--    <imports-->
+    <!--      :table-name="customForm.tableName"-->
+    <!--      :form-info="form"-->
+    <!--      ref="imports"-->
+    <!--      @refresh="$refs['xyTable'].getTableData()"-->
+    <!--    ></imports>-->
+    <!--    <atlas ref="atlas"></atlas>-->
+    <!--    <assetsHistoryList ref="assetsHistoryList"></assetsHistoryList>-->
+  </div>
+</template>
+
+<script>
+import { index as fieldIndex } from "@/api/system/customFormField";
+import { authMixin } from "@/mixin/authMixin";
+import { index, destroy } from "@/api/system/baseForm";
+import { op } from "@/const/op";
+import { download } from "@/utils/downloadRequest";
+import { getparameter } from "@/api/system/dictionary";
+import { show } from "@/api/system/customForm";
+import * as XLSX from "xlsx";
+import { saveAs } from "file-saver";
+import { listdept } from "@/api/system/department"
+
+import add from "./component/addHouse.vue";
+import LxHeader from "@/components/LxHeader/index.vue";
+import headerContent from "@/components/LxHeader/XyContent.vue";
+import addHistory from '@/views/assets/component/addHistory.vue'
+// import drawer from "@/views/component/drawer.vue";
+// import imports from "./imports.vue";
+// import atlas from "@/views/assets/atlas.vue";
+// import assetsHistoryList from '@/views/assets/assetsHistoryList.vue'
+export default {
+  name: 'tableList',
+  components: {
+    LxHeader,
+    add,
+    headerContent,
+    addHistory,
+    // drawer,
+    // imports,
+
+    // atlas,
+    // assetsHistoryList
+  },
+  mixins: [authMixin],
+  provide: {
+    formStore: () => this.form,
+  },
+  data() {
+    return {
+      op,
+      select: {
+        table_name: "",
+        filter: [
+          {
+            key: "",
+            op: "",
+            value: "",
+          },
+        ],
+      },
+      form: [],
+      table: [],
+      customForm: {
+        customFormId: "",
+        tableName: "",
+      },
+    };
+  },
+  methods: {
+    index,
+    destroy,
+    download,
+    reset() {
+      this.select.filter.splice(1);
+      this.select.filter[0] = {
+        key: "",
+        op: "",
+        value: "",
+      };
+    },
+
+    async exportExcel(sheetName) {
+      const res = await index(
+        Object.assign(this.select, { page: 1, page_size: 9999 })
+      );
+      if (res.data) {
+        let headers = this.form.map((i) => {
+          return {
+            key: i.field,
+            title: i.name,
+          };
+        });
+        const data = res.data.map((row) =>
+          headers.map((header) => row[header.key])
+        );
+        data.unshift(headers.map((header) => header.title));
+        const wb = XLSX.utils.book_new();
+        const ws = XLSX.utils.aoa_to_sheet(data);
+        XLSX.utils.book_append_sheet(wb, ws, sheetName);
+        const wbout = XLSX.write(wb, {
+          bookType: "xlsx",
+          bookSST: true,
+          type: "array",
+        });
+        saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          `${sheetName}.xlsx`
+        );
+      }
+    },
+
+    //target要为内存地址引用类型
+    inputStartHandler(e, target) {
+      let temp = target?.value.split(",")[1];
+      target.value = `${e},${temp ? temp : ""}`;
+    },
+    inputEndHandler(e, target) {
+      let temp = target?.value.split(",")[0];
+      target.value = `${temp ? temp : ""},${e}`;
+    },
+
+    async getFormDetail() {
+      if (this.$route.meta.params?.custom_form) {
+        let decode = decodeURIComponent(this.$route.meta.params?.custom_form);
+        try {
+          let custom_form = JSON.parse(decode);
+          this.customForm.customFormId = custom_form.custom_form_id;
+          this.customForm.tableName = custom_form.table_name;
+          this.select.table_name = custom_form.table_name;
+        } catch (err) {
+          console.warn(err);
+        }
+      }
+
+      const res = await show({ id: this.customForm.customFormId }, false);
+
+      //字段处理
+      //初始表白名单
+      let baseTable = new Map([
+        ['departments', async () => {
+          const res = await listdept()
+          return res
+        }],
+        ['admins',[]]
+      ])
+      let { fields, relation } = res;
+      let fieldRes = fields.sort((a,b) => a.sort - b.sort)
+      if (
+        !fields ||
+        !relation ||
+        !fields instanceof Array ||
+        !relation instanceof Array
+      ) {
+        throw new Error("fields或relation格式错误");
+      }
+      console.log(fieldRes)
+      fieldRes?.forEach((i, index) => {
+        i._relations = relation.find(
+          (j) => j.link_table_name.split("_")[1] === i.field
+        );
+        if (i.select_item && typeof i.select_item === "object") {
+          let keys = Object.keys(i.select_item);
+          i._params = keys.map((key) => {
+            return {
+              key,
+              value: /^\d*$/.test(i.select_item[key])
+                ? Number(i.select_item[key])
+                : i.select_item[key],
+            };
+          });
+        }
+        if (i.edit_input === 'file' || i.edit_input === 'files') {
+          return
+        }
+        if (i._relations) {
+          if (baseTable.get(i._relations.link_table_name)) {
+            baseTable
+              .get(i._relations.link_table_name)()
+              .then((res) => {
+                i._params = res.data;
+              });
+          } else {
+            i._params = i._relations.parameter_id
+              ? getparameter({ id: i._relations.parameter_id }, false).then(
+                (res) => {
+                  i._params = res.detail;
+                }
+              )
+              : this.index({
+                table_name: i._relations.link_table_name,
+                page: 1,
+                page_size: 9999,
+              }).then((res) => {
+                i._params = res.data;
+              });
+          }
+        }
+      });
+      this.form = fieldRes || [];
+      this.form
+        ?.filter((i) => i.list_show)
+        .forEach((i) => {
+          let linkOb = {};
+
+          if (i.edit_input === "richtext") {
+            linkOb.customFn = (row) => {
+              return (
+                <div
+                  style={{ "max-height": "55px","overflow": "scroll" }}
+                  domPropsInnerHTML={row[i.field]}
+                ></div>
+              );
+            };
+          }
+          if (
+            i.select_item &&
+            typeof i.select_item === "object" &&
+            !(i.select_item instanceof Array)
+          ) {
+            let keys = Object.keys(i.select_item);
+            linkOb.customFn = (row) => {
+              let paramMap = new Map();
+              keys.forEach((key) => {
+                paramMap.set(i.select_item[key], key);
+              });
+
+              return <span>{paramMap.get(row[i.field]?.toString())}</span>;
+            };
+          }
+          if (i._relations) {
+            let { link_relation, foreign_key, link_with_name } = i._relations;
+            if (link_relation === "newHasOne" || link_relation === "hasOne") {
+              linkOb.customFn = (row) => {
+                if (i.edit_input === "file") {
+                  return (
+                    <a
+                      download={row[link_with_name]?.original_name}
+                      href={row[link_with_name]?.url}
+                    >
+                      {row[link_with_name]?.original_name}
+                    </a>
+                  );
+                } else {
+                  return (
+                    <span>
+                      {row[link_with_name]?.name ||
+                        row[link_with_name]?.no ||
+                        row[link_with_name]?.value}
+                    </span>
+                  );
+                }
+              };
+            }
+
+            if (link_relation === "hasMany" || link_relation === "newHasMany") {
+              linkOb.customFn = (row) => {
+                if (i.edit_input === "files") {
+                  return (
+                    <div style="display: flex;flex-direction: column;">
+                      {row[link_with_name]?.map((o) => (
+                        <a>
+                          { o?.original_name || o?.name }
+                        </a>
+                      ))}
+                    </div>
+                  )
+                } else {
+                  return (
+                    <div>
+                      {row[link_with_name]?.map((o) => (
+                        <p>
+                          {o?.name ||
+                            o?.no ||
+                            o?.value ||
+                            o?.biaoti ||
+                            o?.mingcheng}
+                        </p>
+                      ))}
+                    </div>
+                  );
+                }
+              };
+            }
+          }
+
+          let alignLeft = ['dikuaimingcheng','chengjiandanwei','jianshedanwei','wuyedanwei']
+          this.table.push(
+            Object.assign(
+              {
+                prop: i.field,
+                label: i.name,
+                width: i.width,
+                align: alignLeft.find(m => m === i.field) ? 'left' : 'center',
+                fixed: i.is_fixed,
+              },
+              linkOb
+            )
+          );
+        });
+      this.table.unshift({
+        type: "index",
+        width: 60,
+        label: "序号",
+      });
+    },
+  },
+
+  computed: {
+    columnArrTest() {
+      return function (field) {
+        return this.form.find((i) => i.field === field)
+          ? this.form.find((i) => i.field === field).search_input === "checkbox" || this.form.find((i) => i.field === field).search_input === "radio"
+          : false;
+      };
+    },
+    getColumnField() {
+      return function (field) {
+        return this.form.find((i) => i.field === field)
+          ? this.form.find((i) => i.field === field)
+          : {};
+      };
+    },
+    getColumnParams() {
+      return function (field) {
+        return this.form.find((i) => i.field === field)
+          ? this.form.find((i) => i.field === field)._params
+          : [];
+      };
+    }
+  },
+  created() {
+    this.getFormDetail();
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.select {
+  &__item {
+    & > p {
+      display: inline-block;
+      width: 80px;
+      text-align: center;
+    }
+
+    & + div {
+      margin-top: 6px;
+    }
+  }
+}
+.add-btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  margin-top: 10px;
+  & > span {
+    padding: 0 10px;
+  }
+}
+
+a {
+  color: red;
+  text-decoration: none;
+  transition: all 0.2s;
+}
+
+a:hover {
+  color: red;
+  text-decoration: underline;
+}
+</style>
diff --git a/src/views/assets/land.vue b/src/views/assets/land.vue
new file mode 100644
index 0000000..a6e854a
--- /dev/null
+++ b/src/views/assets/land.vue
@@ -0,0 +1,669 @@
+<template>
+  <div>
+    <!-- 查询配置 -->
+    <div>
+      <div ref="lxHeader">
+        <LxHeader
+          :icon="$route.meta.icon"
+          :text="$route.meta.title"
+          style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+        >
+          <div slot="content"></div>
+          <slot>
+            <header-content :auths="auths_auth_mixin">
+              <template #search>
+                <div style="display: flex">
+                  <Select
+                    v-model="select.filter[0].key"
+                    style="width: 100px"
+                    placeholder="搜索条目"
+                  >
+                    <Option
+                      v-for="item in form"
+                      :key="item.id"
+                      :value="item.field"
+                    >{{ item.name }}</Option
+                    >
+                  </Select>
+                  <Select
+                    v-model="select.filter[0].op"
+                    style="width: 100px; margin-left: 10px"
+                    placeholder="搜索条件"
+                  >
+                    <Option
+                      v-for="item in op"
+                      :key="item.value"
+                      :value="item.value"
+                    >{{ item.label }}</Option
+                    >
+                  </Select>
+                  <template
+                    v-if="
+                      select.filter[0].op !== 'range' &&
+                      !columnArrTest(select.filter[0].key)
+                    "
+                  >
+                    <Input
+                      v-model="select.filter[0].value"
+                      style="width: 150px; margin-left: 10px"
+                      placeholder="请填写关键词"
+                    />
+                  </template>
+                  <template
+                    v-else-if="
+                      select.filter[0].op !== 'range' &&
+                      columnArrTest(select.filter[0].key)
+                    "
+                  >
+                    <Select
+                      v-model="select.filter[0].value"
+                      style="width: 150px; margin-left: 10px"
+                      placeholder="请选择关键词"
+                    >
+                      <Option
+                        v-for="item in getColumnParams(select.filter[0].key)"
+                        :key="item.id"
+                        :value="getColumnField(select.filter[0].key)._relations ? item[getColumnField(select.filter[0].key)._relations.foreign_key] : item.value"
+                      >{{
+                          item.key || item.value || item.name || item.no || item.mingcheng || item.id
+                        }}</Option
+                      >
+                    </Select>
+                  </template>
+                  <template v-else>
+                    <Input
+                      :value="select.filter[0].value.split(',')[0]"
+                      style="width: 150px; margin-left: 10px"
+                      placeholder="范围开始关键词"
+                      @input="(e) => inputStartHandler(e, select.filter[0])"
+                    />
+                    <span
+                      style="
+                        margin-left: 10px;
+                        display: flex;
+                        align-items: center;
+                      "
+                    >至</span
+                    >
+                    <Input
+                      :value="select.filter[0].value.split(',')[1]"
+                      style="width: 150px; margin-left: 10px"
+                      placeholder="范围结束关键词"
+                      @input="(e) => inputEndHandler(e, select.filter[0])"
+                    />
+                  </template>
+                  <Button
+                    style="margin-left: 10px"
+                    type="primary"
+                    @click="$refs['xyTable'].getTableData(true)"
+                  >查询</Button
+                  >
+
+                  <xy-selectors
+                    style="margin-left: 10px"
+                    @reset="reset"
+                    @search="$refs['xyTable'].getTableData(true)"
+                  >
+                    <template>
+                      <div class="select">
+                        <div
+                          class="select__item"
+                          v-for="(item, index) in select.filter"
+                          :key="`${item.value}-${index}`"
+                        >
+                          <p>条件{{ index + 1 }}</p>
+                          <Select
+                            v-model="item.key"
+                            style="width: 100px"
+                            placeholder="搜索条目"
+                          >
+                            <Option
+                              v-for="item in form"
+                              :key="item.id"
+                              :value="item.field"
+                            >{{ item.name }}</Option
+                            >
+                          </Select>
+                          <Select
+                            v-model="item.op"
+                            style="width: 100px; margin-left: 10px"
+                            placeholder="搜索条件"
+                          >
+                            <Option
+                              v-for="item in op"
+                              :key="item.value"
+                              :value="item.value"
+                            >{{ item.label }}</Option
+                            >
+                          </Select>
+                          <template
+                            v-if="
+                              item.op !== 'range' && !columnArrTest(item.key)
+                            "
+                          >
+                            <Input
+                              v-model="item.value"
+                              style="width: 150px; margin-left: 10px"
+                              placeholder="请填写关键词"
+                            />
+                          </template>
+                          <template
+                            v-else-if="
+                              item.op !== 'range' && columnArrTest(item.key)
+                            "
+                          >
+                            <Select
+                              v-model="item.value"
+                              style="width: 150px; margin-left: 10px"
+                              placeholder="请选择关键词"
+                            >
+                              <Option
+                                v-for="item in getColumnParams(item.key)"
+                                :key="item.id"
+                                :value="getColumnField(item.key)._relations ? item[getColumnField(item.key)._relations.foreign_key] : item.value"
+                              >{{
+                                  item.key || item.value || item.name || item.no || item.mingcheng || item.id
+                                }}</Option
+                              >
+                            </Select>
+                          </template>
+                          <template v-else>
+                            <Input
+                              :value="item.value.split(',')[0]"
+                              style="width: 150px; margin-left: 10px"
+                              placeholder="范围开始关键词"
+                              @input="(e) => inputStartHandler(e, item)"
+                            />
+                            <span style="margin-left: 10px">至</span>
+                            <Input
+                              :value="item.value.split(',')[1]"
+                              style="width: 150px; margin-left: 10px"
+                              placeholder="范围结束关键词"
+                              @input="(e) => inputEndHandler(e, item)"
+                            />
+                          </template>
+                          <el-button
+                            v-if="index !== 0"
+                            size="small"
+                            type="danger"
+                            icon="el-icon-delete"
+                            circle
+                            style="margin-left: 10px"
+                            @click="select.filter.splice(index, 1)"
+                          ></el-button>
+                        </div>
+                      </div>
+                      <div class="add-btn">
+                        <el-button
+                          size="small"
+                          type="primary"
+                          icon="el-icon-plus"
+                          circle
+                          @click="
+                            select.filter.push({ key: '', op: '', value: '' })
+                          "
+                        ></el-button>
+                        <span>新增一条</span>
+                      </div>
+                    </template>
+                  </xy-selectors>
+                </div>
+              </template>
+              <template #create>
+                <Button
+                  type="primary"
+                  @click="
+                    $refs['dialog'].setType('add'), $refs['dialog'].show()
+                  "
+                >新增</Button
+                >
+              </template>
+              <template #import>
+                <Button type="primary" @click="$refs['imports'].show()"
+                >导入</Button
+                >
+              </template>
+              <template #export>
+                <Button
+                  type="primary"
+                  @click="exportExcel(new Date().getTime().toString())"
+                >导出</Button
+                >
+              </template>
+            </header-content>
+          </slot>
+        </LxHeader>
+      </div>
+    </div>
+
+    <xy-table
+      :btn-width="300"
+      :auths="auths_auth_mixin"
+      :delay-req="true"
+      :destroy-action="destroy"
+      ref="xyTable"
+      :border="true"
+      :action="index"
+      :req-opt="select"
+      :destroy-req-opt="select"
+      :table-item="table"
+      @detail="
+        (row) => {
+          $router.push({
+            path: '/assetsDetail',
+            query: {
+              id: row.id
+            }
+          })
+        }
+      "
+      @editor="
+        (row) => {
+          $refs['dialog'].setId(row.id);
+          $refs['dialog'].setType('editor');
+          $refs['dialog'].show();
+        }
+      "
+    >
+      <template #assetsHistory="{row}">
+        <Button
+          size="small"
+          type="primary"
+          @click="$refs['assetsHistoryList'].setId(row.id),$refs['assetsHistoryList'].show()"
+        >历史</Button
+        >
+      </template>
+
+      <template #picture="{row}">
+        <Button
+          size="small"
+          type="primary"
+          @click="$refs['atlas'].setId(row.id),$refs['atlas'].show()"
+        >图集</Button
+        >
+      </template>
+    </xy-table>
+
+    <add
+      :table-name="customForm.tableName"
+      :form-info="form"
+      ref="dialog"
+      @refresh="$refs['xyTable'].getTableData()"
+    >
+    </add>
+<!--    <drawer-->
+<!--      :table-name="customForm.tableName"-->
+<!--      :form-info="form"-->
+<!--      ref="drawer"-->
+<!--    ></drawer>-->
+<!--    <imports-->
+<!--      :table-name="customForm.tableName"-->
+<!--      :form-info="form"-->
+<!--      ref="imports"-->
+<!--      @refresh="$refs['xyTable'].getTableData()"-->
+<!--    ></imports>-->
+<!--    <atlas ref="atlas"></atlas>-->
+<!--    <assetsHistoryList ref="assetsHistoryList"></assetsHistoryList>-->
+  </div>
+</template>
+
+<script>
+import { index as fieldIndex } from "@/api/system/customFormField";
+import { authMixin } from "@/mixin/authMixin";
+import { index, destroy } from "@/api/system/baseForm";
+import { op } from "@/const/op";
+import { download } from "@/utils/downloadRequest";
+import { getparameter } from "@/api/system/dictionary";
+import { show } from "@/api/system/customForm";
+import * as XLSX from "xlsx";
+import { saveAs } from "file-saver";
+import { listdept } from "@/api/system/department"
+
+import add from "./component/addLand.vue";
+import LxHeader from "@/components/LxHeader/index.vue";
+import headerContent from "@/components/LxHeader/XyContent.vue";
+// import drawer from "@/views/component/drawer.vue";
+// import imports from "./imports.vue";
+// import atlas from "@/views/assets/atlas.vue";
+// import assetsHistoryList from '@/views/assets/assetsHistoryList.vue'
+export default {
+  name: 'tableList',
+  components: {
+    LxHeader,
+    add,
+    headerContent,
+    // drawer,
+    // imports,
+
+    // atlas,
+    // assetsHistoryList
+  },
+  mixins: [authMixin],
+  provide: {
+    formStore: () => this.form,
+  },
+  data() {
+    return {
+      op,
+      select: {
+        table_name: "",
+        filter: [
+          {
+            key: "",
+            op: "",
+            value: "",
+          },
+        ],
+      },
+      form: [],
+      table: [],
+      customForm: {
+        customFormId: "",
+        tableName: "",
+      },
+    };
+  },
+  methods: {
+    index,
+    destroy,
+    download,
+    reset() {
+      this.select.filter.splice(1);
+      this.select.filter[0] = {
+        key: "",
+        op: "",
+        value: "",
+      };
+    },
+
+    async exportExcel(sheetName) {
+      const res = await index(
+        Object.assign(this.select, { page: 1, page_size: 9999 })
+      );
+      if (res.data) {
+        let headers = this.form.map((i) => {
+          return {
+            key: i.field,
+            title: i.name,
+          };
+        });
+        const data = res.data.map((row) =>
+          headers.map((header) => row[header.key])
+        );
+        data.unshift(headers.map((header) => header.title));
+        const wb = XLSX.utils.book_new();
+        const ws = XLSX.utils.aoa_to_sheet(data);
+        XLSX.utils.book_append_sheet(wb, ws, sheetName);
+        const wbout = XLSX.write(wb, {
+          bookType: "xlsx",
+          bookSST: true,
+          type: "array",
+        });
+        saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          `${sheetName}.xlsx`
+        );
+      }
+    },
+
+    //target要为内存地址引用类型
+    inputStartHandler(e, target) {
+      let temp = target?.value.split(",")[1];
+      target.value = `${e},${temp ? temp : ""}`;
+    },
+    inputEndHandler(e, target) {
+      let temp = target?.value.split(",")[0];
+      target.value = `${temp ? temp : ""},${e}`;
+    },
+
+    async getFormDetail() {
+      if (this.$route.meta.params?.custom_form) {
+        let decode = decodeURIComponent(this.$route.meta.params?.custom_form);
+        try {
+          let custom_form = JSON.parse(decode);
+          this.customForm.customFormId = custom_form.custom_form_id;
+          this.customForm.tableName = custom_form.table_name;
+          this.select.table_name = custom_form.table_name;
+        } catch (err) {
+          console.warn(err);
+        }
+      }
+
+      const res = await show({ id: this.customForm.customFormId }, false);
+
+      //字段处理
+      //初始表白名单
+      let baseTable = new Map([
+        ['departments', async () => {
+          const res = await listdept()
+          return res
+        }],
+        ['admins',[]]
+      ])
+      let { fields, relation } = res;
+      let fieldRes = fields.sort((a,b) => a.sort - b.sort)
+      if (
+        !fields ||
+        !relation ||
+        !fields instanceof Array ||
+        !relation instanceof Array
+      ) {
+        throw new Error("fields或relation格式错误");
+      }
+      console.log(fieldRes)
+      fieldRes?.forEach((i, index) => {
+        i._relations = relation.find(
+          (j) => j.link_table_name.split("_")[1] === i.field
+        );
+        if (i.select_item && typeof i.select_item === "object") {
+          let keys = Object.keys(i.select_item);
+          i._params = keys.map((key) => {
+            return {
+              key,
+              value: /^\d*$/.test(i.select_item[key])
+                ? Number(i.select_item[key])
+                : i.select_item[key],
+            };
+          });
+        }
+        if (i.edit_input === 'file' || i.edit_input === 'files') {
+          return
+        }
+        if (i._relations) {
+          if (baseTable.get(i._relations.link_table_name)) {
+            baseTable
+              .get(i._relations.link_table_name)()
+              .then((res) => {
+                i._params = res.data;
+              });
+          } else {
+            i._params = i._relations.parameter_id
+              ? getparameter({ id: i._relations.parameter_id }, false).then(
+                (res) => {
+                  i._params = res.detail;
+                }
+              )
+              : this.index({
+                table_name: i._relations.link_table_name,
+                page: 1,
+                page_size: 9999,
+              }).then((res) => {
+                i._params = res.data;
+              });
+          }
+        }
+      });
+      this.form = fieldRes || [];
+      this.form
+        ?.filter((i) => i.list_show)
+        .forEach((i) => {
+          let linkOb = {};
+
+          if (i.edit_input === "richtext") {
+            linkOb.customFn = (row) => {
+              return (
+                <div
+                  style={{ "max-height": "55px","overflow": "scroll" }}
+                  domPropsInnerHTML={row[i.field]}
+                ></div>
+              );
+            };
+          }
+          if (
+            i.select_item &&
+            typeof i.select_item === "object" &&
+            !(i.select_item instanceof Array)
+          ) {
+            let keys = Object.keys(i.select_item);
+            linkOb.customFn = (row) => {
+              let paramMap = new Map();
+              keys.forEach((key) => {
+                paramMap.set(i.select_item[key], key);
+              });
+
+              return <span>{paramMap.get(row[i.field]?.toString())}</span>;
+            };
+          }
+          if (i._relations) {
+            let { link_relation, foreign_key, link_with_name } = i._relations;
+            if (link_relation === "newHasOne" || link_relation === "hasOne") {
+              linkOb.customFn = (row) => {
+                if (i.edit_input === "file") {
+                  return (
+                    <a
+                      download={row[link_with_name]?.original_name}
+                      href={row[link_with_name]?.url}
+                    >
+                      {row[link_with_name]?.original_name}
+                    </a>
+                  );
+                } else {
+                  return (
+                    <span>
+                      {row[link_with_name]?.name ||
+                        row[link_with_name]?.no ||
+                        row[link_with_name]?.value}
+                    </span>
+                  );
+                }
+              };
+            }
+
+            if (link_relation === "hasMany" || link_relation === "newHasMany") {
+              linkOb.customFn = (row) => {
+                if (i.edit_input === "files") {
+                  return (
+                    <div style="display: flex;flex-direction: column;">
+                      {row[link_with_name]?.map((o) => (
+                        <a>
+                          { o?.original_name || o?.name }
+                        </a>
+                      ))}
+                    </div>
+                  )
+                } else {
+                  return (
+                    <div>
+                      {row[link_with_name]?.map((o) => (
+                        <p>
+                          {o?.name ||
+                            o?.no ||
+                            o?.value ||
+                            o?.biaoti ||
+                            o?.mingcheng}
+                        </p>
+                      ))}
+                    </div>
+                  );
+                }
+              };
+            }
+          }
+
+          let alignLeft = ['dikuaimingcheng','chengjiandanwei','jianshedanwei','wuyedanwei']
+          this.table.push(
+            Object.assign(
+              {
+                prop: i.field,
+                label: i.name,
+                width: i.width,
+                align: alignLeft.find(m => m === i.field) ? 'left' : 'center',
+                fixed: i.is_fixed,
+              },
+              linkOb
+            )
+          );
+        });
+      this.table.unshift({
+        type: "index",
+        width: 60,
+        label: "序号",
+      });
+    },
+  },
+
+  computed: {
+    columnArrTest() {
+      return function (field) {
+        return this.form.find((i) => i.field === field)
+          ? this.form.find((i) => i.field === field).search_input === "checkbox" || this.form.find((i) => i.field === field).search_input === "radio"
+          : false;
+      };
+    },
+    getColumnField() {
+      return function (field) {
+        return this.form.find((i) => i.field === field)
+          ? this.form.find((i) => i.field === field)
+          : {};
+      };
+    },
+    getColumnParams() {
+      return function (field) {
+        return this.form.find((i) => i.field === field)
+          ? this.form.find((i) => i.field === field)._params
+          : [];
+      };
+    }
+  },
+  created() {
+    this.getFormDetail();
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.select {
+  &__item {
+    & > p {
+      display: inline-block;
+      width: 80px;
+      text-align: center;
+    }
+
+    & + div {
+      margin-top: 6px;
+    }
+  }
+}
+.add-btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  margin-top: 10px;
+  & > span {
+    padding: 0 10px;
+  }
+}
+
+a {
+  color: red;
+  text-decoration: none;
+  transition: all 0.2s;
+}
+
+a:hover {
+  color: red;
+  text-decoration: underline;
+}
+</style>
diff --git a/src/views/component/dialogTemplate.vue b/src/views/component/dialogTemplate.vue
new file mode 100644
index 0000000..8a2af70
--- /dev/null
+++ b/src/views/component/dialogTemplate.vue
@@ -0,0 +1,302 @@
+<script>
+import { save, show, index, destroy } from "@/api/system/baseForm";
+import { CreateDialog } from "@/utils/createDialog"
+import { deepCopy } from "@/utils";
+export default {
+  props: {
+    formInfo: {
+      type: Array,
+      default: () => [],
+    },
+    tableName: String,
+  },
+  render(h) {
+    let dialog = new CreateDialog(this,[])
+    return dialog.render()
+  },
+  data() {
+    return {
+      id: "",
+      type: "add",
+      dialogVisible: false,
+      form: {},
+      originalForm: {},
+      rules: {},
+      file: {},
+    };
+  },
+  methods: {
+    init() {
+      for (let key in this.form) {
+        if (this.form[key] instanceof Array) {
+          this.form[key] = [];
+        } else {
+          this.form[key] = "";
+        }
+      }
+      this.$refs["elForm"].clearValidate();
+    },
+    show() {
+      this.dialogVisible = true;
+    },
+    hidden() {
+      this.dialogVisible = false;
+    },
+    setType(type = "add") {
+      let types = ["add", "editor"];
+      if (types.includes(type)) {
+        this.type = type;
+      } else {
+        console.warn("Unknown type: " + type);
+      }
+    },
+    setId(id) {
+      if (typeof id == "number") {
+        this.id = id;
+      } else {
+        console.error("error typeof id: " + typeof id);
+      }
+    },
+
+    async getDetail() {
+      const res = await show({ id: this.id, table_name: this.tableName });
+      this.$integrateData(this.form, res);
+
+      this.formInfo.forEach((i) => {
+        if (i && (i.edit_input === "file" || i.edit_input === "files")) {
+          res[i._relations.link_with_name]
+            ? (this.file[i.field] =
+                res[i._relations.link_with_name] instanceof Array
+                  ? res[i._relations.link_with_name].map((i) => {
+                      return {
+                        name: i?.name,
+                        url: i?.url,
+                        response: i,
+                      };
+                    })
+                  : [
+                      {
+                        name: res[i._relations.link_with_name]?.name,
+                        url: res[i._relations.link_with_name]?.url,
+                        response: res[i._relations.link_with_name],
+                      },
+                    ])
+            : (this.file[i.field] = []);
+        }
+
+        this.form = Object.assign({}, this.form);
+        this.originalForm = deepCopy(res);
+      });
+    },
+
+    submit() {
+      let promiseAll = [];
+      if (this.type === "add") {
+        if (this.form.hasOwnProperty("id")) {
+          delete this.form.id;
+        }
+      }
+      if (this.type === "editor") {
+        Object.defineProperty(this.form, "id", {
+          value: this.id,
+          enumerable: true,
+          configurable: true,
+          writable: true,
+        });
+      }
+      this.$refs["elForm"].validate((validate) => {
+        if (validate) {
+          let copyForm = deepCopy(this.form);
+          this.formInfo.forEach((info) => {
+            if (
+              info._relations?.link_relation === "newHasMany" ||
+              info._relations?.link_relation === "hasMany"
+            ) {
+              if (this.originalForm[info._relations.link_with_name]) {
+                this.originalForm[info._relations.link_with_name].map((i) => {
+                  promiseAll.push(
+                    destroy({
+                      id: i.id,
+                      table_name: info._relations.link_table_name,
+                    })
+                  );
+                });
+              }
+            }
+
+            if (copyForm[info._relations?.link_with_name]?.length > 0) {
+              delete copyForm[info.field];
+            }
+            if (
+              info._relations?.link_relation === "newHasMany" ||
+              info._relations?.link_relation === "hasMany"
+            ) {
+              if (info.edit_input === "files") {
+                copyForm[info._relations.link_with_name] = this.file[
+                  info.field
+                ]?.map((i) => {
+                  let copyRelation = i?.response ? deepCopy(i?.response) : "";
+                  delete copyRelation.id;
+                  return {
+                    upload_id: i?.response?.id,
+                    ...copyRelation,
+                  };
+                });
+              } else {
+                copyForm[info._relations.link_with_name] = copyForm[
+                  info.field
+                ]?.map((i) => {
+                  let copyRelation = info._params.find(
+                    (param) => param[info._relations?.foreign_key] === i
+                  )
+                    ? deepCopy(
+                        info._params.find(
+                          (param) => param[info._relations?.foreign_key] === i
+                        )
+                      )
+                    : "";
+                  delete copyRelation.id;
+                  return {
+                    [info._relations.foreign_key]: i,
+                    ...copyRelation,
+                  };
+                });
+              }
+
+              delete copyForm[info.field];
+            }
+            if (
+              info._relations?.link_relation === "newHasOne" ||
+              info._relations?.link_relation === "hasOne"
+            ) {
+              if (info.edit_input === "file") {
+                copyForm[info._relations.link_with_name] = [
+                  {
+                    upload_id: this.file[info.field]?.response?.id,
+                    ...this.file[info.field],
+                  },
+                ];
+              } else {
+                let copyRelation = deepCopy(
+                  info._params.find(
+                    (param) => param.id == this.form[info.field]
+                  )
+                );
+                if (copyRelation) {
+                  delete copyRelation.id;
+                  copyForm[info._relations.link_with_name] = [
+                    {
+                      id: this.form[info._relations?.link_with_name]?.id,
+                      [info.field === "shenhebumen"
+                        ? "dept_id"
+                        : info._relations.foreign_key]: this.form[info.field],
+                      ...copyRelation,
+                    },
+                  ];
+                }
+              }
+
+              delete copyForm[info.field];
+            }
+            if (!copyForm[info._relations?.link_with_name]) {
+              delete copyForm[info._relations?.link_with_name];
+            }
+          });
+          promiseAll.push(
+            save(Object.assign(copyForm, { table_name: this.tableName }))
+          );
+          Promise.all(promiseAll).then((res) => {
+            this.$Message.success({
+              content: `${this.type === "add" ? "新增" : "编辑"}成功`,
+            });
+            this.$emit("refresh");
+            this.hidden();
+          });
+        }
+      });
+    },
+  },
+  computed: {},
+  watch: {
+    formInfo: {
+      handler: function (newVal) {
+        this.form = {};
+        this.rules = {};
+        this.file = {};
+        newVal.forEach((i) => {
+          if (i.field) {
+            this.form[i.field] = "";
+            if (
+              i.validation instanceof Array &&
+              i.validation.length > 0 &&
+              !!i.validation.find((i) => i === "required")
+            ) {
+              this.rules[i.field] = [
+                { required: true, message: `请填写${i.name}` },
+              ];
+            }
+            if (i.edit_input === "files") {
+              this.form[i.field] = [];
+            }
+            if (i.edit_input === "files" || i.edit_input === "file") {
+              this.file[i.field] = [];
+            }
+            if (i.edit_input === "checkbox") {
+              this.form[i.field] = [];
+            }
+            if (i._relations) {
+              this.form[i._relations?.link_with_name] = [];
+            }
+          }
+        });
+
+        document.documentElement.style.setProperty(
+          "--column-num",
+          Math.floor(newVal.length / 8).toString()
+        );
+      },
+      //immediate: true,
+    },
+    dialogVisible(val) {
+      if (val) {
+        if (this.type === "editor") {
+          this.$nextTick(() => this.getDetail());
+        }
+      } else {
+        this.id = "";
+        this.type = "";
+        this.init();
+        this.$refs["elForm"].clearValidate();
+        delete this.form.id;
+        for (let key in this.file) {
+          this.file[key] = [];
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style>
+:root {
+  --column-num: 2;
+}
+</style>
+<style scoped lang="scss">
+.uploaded-a {
+  color: red;
+  text-decoration: none;
+  transition: all 0.2s;
+}
+
+.uploaded-a:hover {
+  color: red;
+  text-decoration: underline;
+}
+
+.form-body {
+  display: grid;
+  grid-gap: 10px;
+  grid-template-columns: repeat(var(--column-num), 1fr);
+}
+</style>
diff --git a/src/views/component/map.vue b/src/views/component/map.vue
index a03776d..4277edb 100644
--- a/src/views/component/map.vue
+++ b/src/views/component/map.vue
@@ -482,6 +482,9 @@ export default {
         closeWhenClickMap: true,
         offset: new AMap.Pixel(-10, -10),
       });
+      this.map.on('click',e => {
+        console.log(e)
+      })
     },
     // 加载
     areaBG(adcode = ["320200"]) {
@@ -513,6 +516,9 @@ export default {
                 fillColor: "#3579c788",
                 strokeColor: "#3579c7",
               });
+              polygon.on('click',e => {
+                console.log('polygon',e)
+              })
               this.polygons.push(polygon);
               this.map.setFitView(polygon);
             }