diff --git a/src/api/other/index.js b/src/api/other/index.js
index f4aab07..9683b8a 100644
--- a/src/api/other/index.js
+++ b/src/api/other/index.js
@@ -7,3 +7,30 @@ export function getOaToken (isLoading=false) {
     isLoading
   })
 }
+
+export function weather (params) {
+  return request({
+    url: "/api/admin/other/weather",
+    method: "get",
+    params,
+    isLoading: false
+  })
+}
+
+export function info (data) {
+  return request({
+    url: "/api/admin/other/get-daily-details-by-date",
+    method: "post",
+    data,
+    isLoading: false
+  })
+}
+
+export function equipmentInfos (params) {
+  return request({
+    url: "/api/admin/other/list-hob-real",
+    method: "get",
+    params,
+    isLoading: false
+  })
+}
diff --git a/src/settings.js b/src/settings.js
index 46696f8..3b8e99e 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -23,5 +23,5 @@ module.exports = {
    * @type {number}
    * @description 调令列表刷新分钟间隔
    */
-  refreshTransferTime: 2 * 60 * 1000,
+  refreshTransferTime: 30 * 1000,
 }
diff --git a/src/utils/createDialog.js b/src/utils/createDialog.js
index 24c9d46..f8d94e0 100644
--- a/src/utils/createDialog.js
+++ b/src/utils/createDialog.js
@@ -146,6 +146,7 @@ export class CreateDialog {
             : "编辑",
           visible: that.dialogVisible,
           width: this.options?.width ? this.options.width : "800px",
+          "append-to-body": true
         },
         on: {
           "update:visible": (val) => {
diff --git a/src/views/bigScreen1/component/callback.vue b/src/views/bigScreen1/component/callback.vue
new file mode 100644
index 0000000..a1829e6
--- /dev/null
+++ b/src/views/bigScreen1/component/callback.vue
@@ -0,0 +1,220 @@
+<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,[
+      {
+      }
+    ],{
+      width: "650px"
+    })
+    return dialog.render()
+  },
+  data() {
+    return {
+      columns: 1,
+      row: {},
+      formInfo: [],
+      id: "",
+      transfer_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", "show"];
+      if (types.includes(type)) {
+        this.type = type;
+      } else {
+        console.warn("Unknown type: " + type);
+      }
+    },
+    setId(id) {
+      if (typeof id == "number") {
+        this.transfer_id = id;
+      } else {
+        console.error("error typeof id: " + typeof id);
+      }
+    },
+
+    async getDetail() {
+      const res = await show({ id: this.id, table_name: 'feedbacks' });
+      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() {
+      if (this.type === "add") {
+        this.form.transfer_id = this.transfer_id;
+        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,
+        });
+      }
+
+
+      save(Object.assign(this.form, { table_name: 'feedbacks' })).then(res => {
+        this.$Message.success({
+          content: `${this.type === "add" ? "新增" : "编辑"}成功`,
+        });
+        this.$emit("refresh");
+        this.hidden();
+      })
+    },
+  },
+  computed: {
+    title () {
+      if (this.type === 'add') return '新增'
+      if (this.type === 'editor') return '编辑'
+      if (this.type === 'show') return '查看'
+    }
+  },
+  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] = [];
+            }
+          }
+        });
+
+        this.columns = newVal.length > 11 ? '2' : '1'
+      },
+      //immediate: true,
+    },
+    dialogVisible(val) {
+      if (val) {
+        document.documentElement.style.setProperty(
+          "--column-num",
+          this.columns
+        );
+        if (this.type === "editor" || this.type === "show") {
+          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(5,'form').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/bigScreen1/component/detailTransfer.vue b/src/views/bigScreen1/component/detailTransfer.vue
new file mode 100644
index 0000000..070a28e
--- /dev/null
+++ b/src/views/bigScreen1/component/detailTransfer.vue
@@ -0,0 +1,609 @@
+<template>
+  <div>
+    <transition name="fade">
+      <div v-show="isShow" class="modal" :style="{ 'z-index': zIndex }">
+        <div class="mask" @click.stop="hide"></div>
+
+        <dv-border-box-10 style="z-index: 11; width: 100%; height: 100%;">
+          <div style="padding: 5px; width: 100%; height: 100%;">
+            <table style="background: #fefefe;border-radius: 10px;">
+              <thead>
+                <tr>
+                  <th
+                    colspan="2"
+                    style="
+                      height: 56px;
+                      font-size: 2.2rem;
+                      letter-spacing: 4px;
+                      font-weight: 600;
+                    "
+                  >
+                    <div style="position: relative">
+                      <p>
+                        {{
+                          data && data.equipment_id_equipments_id_relation
+                            ? data.equipment_id_equipments_id_relation.name
+                            : ""
+                        }}
+                      </p>
+                      <Button
+                        style="
+                          position: absolute;
+                          top: 50%;
+                          right: 20px;
+                          transform: translateY(-50%);
+                          width: 46px;
+                        "
+                        type="primary"
+                        size="small"
+                        ghost
+                        @click="hide"
+                        >关闭</Button
+                      >
+                    </div>
+                  </th>
+                </tr>
+                <tr style="height: 36px">
+                  <th>时间</th>
+                  <th style="width: 64%">内容</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>
+                    <div>
+                      <div>
+                        {{
+                          $moment(data.start_time).format("YYYY-MM-DD HH:mm")
+                        }}
+                      </div>
+                      <div style="padding: 10px 0">~</div>
+                      <div>
+                        {{ $moment(data.end_time).format("YYYY-MM-DD HH:mm") }}
+                      </div>
+                    </div>
+                  </td>
+                  <td>
+                    <div
+                      style="
+                        line-height: 1.5;
+                        text-align: left;
+                        padding: 10px;
+                        height: 100%;
+                        display: flex;
+                        flex-direction: column;
+                        justify-content: flex-start;
+                      "
+                    >
+                      <p>发令人：{{ data.admin ? data.admin.name : "" }}</p>
+                      <p>
+                        发令时间：{{
+                          $moment(data.created_at).format("YYYY-MM-DD HH:mm")
+                        }}
+                      </p>
+                      <p>接收人：{{ data.jieshouren }}</p>
+                      <p>
+                        开启时间：{{
+                          $moment(data.start_time).format("YYYY-MM-DD HH:mm")
+                        }}
+                      </p>
+                      <p>
+                        关闭时间：{{
+                          $moment(data.end_time).format("YYYY-MM-DD HH:mm")
+                        }}
+                      </p>
+                      指令内容：{{ data.content }}
+                      <p style="padding: 6px 0">
+                        执行状态：{{ typeMap.get(data.status) }}
+                      </p>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>执行状态</td>
+                  <td>
+                    <template v-if="data.status === 2 || data.status === 3">
+                      <div class="sign-container" v-if="!readonly">
+                        <vEsign
+                          style="flex: 1"
+                          ref="esign"
+                          line-color="#333"
+                          bg-color=""
+                          :line-width="5"
+                        ></vEsign>
+
+                        <div class="btns">
+                          <Button
+                            type="primary"
+                            size="small"
+                            ghost
+                            @click="$refs['esign'].reset()"
+                            >清空签名</Button
+                          >
+                          <Button
+                            type="primary"
+                            size="small"
+                            @click="esignConfirm(false)"
+                            >通知现场</Button
+                          >
+                          <Button
+                            type="primary"
+                            size="small"
+                            @click="esignConfirm(true)"
+                            >确认执行</Button
+                          >
+                        </div>
+                      </div>
+                    </template>
+                    <template v-else-if="data.status === 4">
+                      <div class="sign-container" v-if="!readonly">
+                        <vEsign
+                          style="flex: 1"
+                          ref="esign"
+                          line-color="#333"
+                          bg-color=""
+                          :line-width="5"
+                        ></vEsign>
+
+                        <div class="btns">
+                          <Button
+                            type="primary"
+                            size="small"
+                            ghost
+                            @click="$refs['esign'].reset()"
+                            >清空签名</Button
+                          >
+                          <Button
+                            type="primary"
+                            size="small"
+                            @click="esignConfirm(true)"
+                            >确认执行</Button
+                          >
+                        </div>
+                      </div>
+                    </template>
+                    <template v-else-if="data.status === 5">
+                      <div class="sign-container">
+                        <div v-if="data.act_start_time">
+                          <div>
+                            <p style="text-align: left">
+                              开启时间：{{
+                                $moment(data.act_start_time).format(
+                                  "YYYY-MM-DD HH:mm"
+                                )
+                              }}
+                            </p>
+                            <img
+                              style="height: 50px"
+                              class="d-flex"
+                              :src="
+                                data.start_sign_uploads_id_relation
+                                  ? data.start_sign_uploads_id_relation.url
+                                  : ''
+                              "
+                              alt=""
+                            />
+                          </div>
+                        </div>
+
+                        <vEsign
+                          v-if="!readonly"
+                          style="flex: 1"
+                          ref="esign"
+                          line-color="#333"
+                          bg-color=""
+                          :line-width="5"
+                        ></vEsign>
+
+                        <div class="btns" v-if="!readonly">
+                          <Button
+                            type="primary"
+                            size="small"
+                            ghost
+                            @click="$refs['esign'].reset()"
+                            >清空签名</Button
+                          >
+                          <Button
+                            type="primary"
+                            size="small"
+                            @click="esignConfirm(false)"
+                            >通知现场</Button
+                          >
+                          <Button
+                            type="primary"
+                            size="small"
+                            @click="esignConfirm(true)"
+                            >确认关闭</Button
+                          >
+                        </div>
+                      </div>
+                    </template>
+                    <template v-else-if="data.status === 6">
+                      <div class="sign-container">
+                        <div v-if="data.act_start_time">
+                          <div>
+                            <p style="text-align: left">
+                              开启时间：{{
+                                $moment(data.act_start_time).format(
+                                  "YYYY-MM-DD HH:mm"
+                                )
+                              }}
+                            </p>
+                            <img
+                              style="height: 50px"
+                              class="d-flex"
+                              :src="
+                                data.start_sign_uploads_id_relation
+                                  ? data.start_sign_uploads_id_relation.url
+                                  : ''
+                              "
+                              alt=""
+                            />
+                          </div>
+                        </div>
+
+                        <vEsign
+                          v-if="!readonly"
+                          style="flex: 1"
+                          ref="esign"
+                          line-color="#333"
+                          bg-color=""
+                          :line-width="5"
+                        ></vEsign>
+
+                        <div class="btns" v-if="!readonly">
+                          <Button
+                            type="primary"
+                            size="small"
+                            ghost
+                            @click="$refs['esign'].reset()"
+                            >清空签名</Button
+                          >
+                          <Button
+                            type="primary"
+                            size="small"
+                            @click="esignConfirm(true)"
+                            >确认关闭</Button
+                          >
+                        </div>
+                      </div>
+                    </template>
+                    <template v-else>
+                      <div
+                        style="padding: 20px; height: 100%"
+                        class="d-flex flex-column"
+                      >
+                        <div class="flex-1">
+                          <p style="text-align: left">
+                            开启时间：{{
+                              $moment(data.act_start_time).format(
+                                "YYYY-MM-DD HH:mm"
+                              )
+                            }}
+                          </p>
+                          <img
+                            style="height: 50px"
+                            class="d-flex"
+                            :src="
+                              data.start_sign_uploads_id_relation
+                                ? data.start_sign_uploads_id_relation.url
+                                : ''
+                            "
+                            alt=""
+                          />
+                        </div>
+                        <div style="margin-top: 20px" class="flex-1">
+                          <p style="text-align: left">
+                            关闭时间：{{
+                              $moment(data.act_end_time).format(
+                                "YYYY-MM-DD HH:mm"
+                              )
+                            }}
+                          </p>
+                          <img
+                            style="height: 50px"
+                            class="d-flex"
+                            :src="
+                              data.end_sign_uploads_id_relation
+                                ? data.end_sign_uploads_id_relation.url
+                                : ''
+                            "
+                            alt=""
+                          />
+                        </div>
+                      </div>
+                    </template>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </dv-border-box-10>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script>
+import { PopupManager } from "element-ui/src/utils/popup"
+import axios from "axios";
+import vEsign from "vue-esign";
+import { base64toFile, deepCopy } from "@/utils";
+import { getToken } from "@/utils/auth";
+import { save } from "@/api/system/baseForm";
+export default {
+  components: {
+    vEsign,
+  },
+  data() {
+    return {
+      zIndex: 2000,
+      isShow: false,
+      readonly: false,
+      data: {},
+      typeMap: new Map([
+        [1, "待下发"],
+        [2, "已下发"],
+        [3, "确认接受"],
+        [4, "已通知开机"],
+        [5, "确认开机"],
+        [6, "已通知关机"],
+        [7, "确认关机"]
+      ]),
+    };
+  },
+  methods: {
+    show() {
+      this.$emit('pause')
+      if (!this.readonly) {
+        if (this.data.status === 2) {
+          this.$confirm(
+            "确认接收调令？",
+            "提示",
+            {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }
+          ).then((res) => {
+            let copyData = deepCopy(this.data);
+            copyData.status = 3;
+            for (let key in copyData) {
+              if (/_relation/g.test(key)) {
+                delete copyData[key];
+              }
+            }
+            save(
+              {
+                table_name: "transfers",
+                ...copyData,
+              },
+              false
+            ).then((_) => {
+              this.$emit("refresh");
+              this.$emit('start')
+            });
+          }).catch(_ => {
+            this.$emit('start')
+          });
+          return;
+        }
+        if (this.data.status === 3 || this.data.status === 5) {
+          this.$confirm(
+            `确认要通知现场${this.data.status === 3 ? "开启" : "关闭"}？`,
+            "提示",
+            {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }
+          ).then((res) => {
+            let copyData = deepCopy(this.data);
+            copyData.status = this.data.status === 3 ? 4 : 6;
+            for (let key in copyData) {
+              if (/_relation/g.test(key)) {
+                delete copyData[key];
+              }
+            }
+            save(
+              {
+                table_name: "transfers",
+                ...copyData,
+              },
+              false
+            ).then((_) => {
+              this.$emit("refresh");
+              this.$emit('start')
+            });
+          }).catch(_ => {
+            this.$emit('start')
+          });
+          return;
+        }
+      }
+      this.zIndex = PopupManager.nextZIndex()
+      this.isShow = true;
+    },
+    hide() {
+      this.$emit('start');
+      this.isShow = false;
+    },
+    setData(data) {
+      this.data = data;
+    },
+    async esignConfirm(isSign) {
+      let fileInfo;
+      if (this.$refs["esign"] && isSign) {
+        const base64 = await this.$refs["esign"].generate({
+          format: "image/png",
+          quality: 0.7,
+        });
+        const file = base64toFile(base64, `${new Date().getTime()}.png`);
+        const form = new FormData();
+        form.append("file", file);
+        fileInfo = await axios.post(process.env.VUE_APP_UPLOAD_API, form, {
+          headers: {
+            Authorization: "Bearer " + getToken(),
+          },
+        });
+      }
+
+      let copyData = deepCopy(this.data);
+      if (this.data.status === 2) {
+        //弃，已用modal
+        copyData.status = isSign ? 4 : 3;
+        if (isSign) {
+          copyData.start_sign = fileInfo.data?.id;
+          copyData.act_start_time = this.$moment().format("YYYY-MM-DD HH:mm");
+        }
+        for (let key in copyData) {
+          if (/_relation/g.test(key)) {
+            delete copyData[key];
+          }
+        }
+        save({
+          table_name: "transfers",
+          ...copyData,
+        },false).then((_) => {
+          this.$emit("refresh");
+        });
+      }
+      if (this.data.status === 3) {
+        //弃，已用modal
+        copyData.status = 4;
+        copyData.start_sign = fileInfo.data?.id;
+        copyData.act_start_time = this.$moment().format("YYYY-MM-DD HH:mm");
+        for (let key in copyData) {
+          if (/_relation/g.test(key)) {
+            delete copyData[key];
+          }
+        }
+        save({
+          table_name: "transfers",
+          ...copyData,
+        },false).then((_) => {
+          this.$emit("refresh");
+        });
+      }
+      if (this.data.status === 4) {
+        copyData.status = 5;
+        if (isSign) {
+          copyData.start_sign = fileInfo.data?.id;
+          copyData.act_start_time = this.$moment().format("YYYY-MM-DD HH:mm");
+        }
+        for (let key in copyData) {
+          if (/_relation/g.test(key)) {
+            delete copyData[key];
+          }
+        }
+        save({
+          table_name: "transfers",
+          ...copyData,
+        },false).then((_) => {
+          this.$emit("refresh");
+          this.$emit('start')
+        });
+      }
+      if (this.data.status === 5) {
+        //弃，已用modal
+        copyData.status = 6;
+        copyData.end_sign = fileInfo.data?.id;
+        copyData.act_end_time = this.$moment().format("YYYY-MM-DD HH:mm");
+        for (let key in copyData) {
+          if (/_relation/g.test(key)) {
+            delete copyData[key];
+          }
+        }
+        save({
+          table_name: "transfers",
+          ...copyData,
+        },false).then((_) => {
+          this.$emit("refresh");
+        });
+      }
+      if (this.data.status === 6) {
+        copyData.status = 7;
+        if (isSign) {
+          copyData.end_sign = fileInfo.data?.id;
+          copyData.act_end_time = this.$moment().format("YYYY-MM-DD HH:mm");
+        }
+        for (let key in copyData) {
+          if (/_relation/g.test(key)) {
+            delete copyData[key];
+          }
+        }
+        save({
+          table_name: "transfers",
+          ...copyData,
+        },false).then((_) => {
+          this.$emit("refresh");
+          this.$emit('start')
+        });
+      }
+
+      this.$refs["esign"]?.reset();
+      this.hide();
+    },
+  },
+  computed: {},
+};
+</script>
+
+<style scoped lang="scss">
+@import "src/styles/scss/style";
+$width: 100rem;
+$height: 70rem;
+.mask {
+  background: #00000022;
+
+  z-index: 10;
+  position: fixed;
+  inset: 0 0 0 0;
+}
+.modal {
+  width: $width;
+  height: $height;
+  border-radius: 22px / 12px;
+  z-index: 11;
+  position: fixed;
+  top: calc(50% - (#{$height} / 2));
+  left: calc(50% - (#{$width} / 2));
+
+  table {
+    color: #333;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 1.3rem;
+    width: 100%;
+    height: 100%;
+
+    td,
+    th {
+      border-right: 2px solid #333;
+      border-bottom: 2px solid #333;
+    }
+    td:nth-last-child(1),th:nth-last-child(1) {
+      border-right: none;
+    }
+    tbody tr:nth-last-child(1) {
+      td,th {
+        border-bottom: none;
+      }
+    }
+  }
+
+  .sign-container {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
+    padding: 20px;
+    .btns {
+    }
+  }
+}
+::v-deep .ivu-btn-small {
+  font-size: 1.2rem;
+  padding: 0 10px;
+}
+</style>
diff --git a/src/views/bigScreen1/component/doing.vue b/src/views/bigScreen1/component/doing.vue
index 98b6b2f..4d699c9 100644
--- a/src/views/bigScreen1/component/doing.vue
+++ b/src/views/bigScreen1/component/doing.vue
@@ -1,17 +1,412 @@
 <template>
-  <div>
+  <div class="container" @mouseenter="isMouseEnter = true" @mouseleave="isMouseEnter = false">
+    <div class="header">
+      <p>执行中</p>
+
+      <div class="type">
+        <div class="type-item" v-for="item in statusType">
+          <div class="type-item__color" :style="{ 'background': item.color }"></div>
+          <p class="type-item__label">{{ item.label }}</p>
+        </div>
+      </div>
+    </div>
+
+    <el-scrollbar ref="elScrollbar" wrap-class="scroll-wrap">
+      <div class="list">
+        <transition-group name="scroll-list" ref="listItems">
+          <div v-for="(item, index) in scrollList" :key="item.id" ref="listItem" class="list-item" :class="`list-item-${timeStatusFormat(item)}`">
+            <div class="list-item__status">
+              <template v-if="timeStatusFormat(item) === 2">
+                <div class="list-item__status-2"></div>
+                <p>【存在执行中指令】</p>
+              </template>
+              <template v-else-if="timeStatusFormat(item) === 3">
+                <div class="list-item__status-3"></div>
+                <p>【倒计时{{ $moment(item.end_time).diff($moment(time),'minutes') }}分钟】</p>
+              </template>
+              <template v-else-if="timeStatusFormat(item) === 4">
+                <div class="list-item__status-4"></div>
+                <p>【超时未执行】</p>
+              </template>
+              <template v-else>
+
+              </template>
+            </div>
+            <div class="list-item__name">
+              {{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}
+            </div>
+            <div class="list-item__time">
+              执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
+            </div>
+            <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时</div>
+            <div class="list-item__operate">
+              <div v-for="(s, si) in status" class="step" @click="stepClick(item,s)">
+                <div class="step-icon">
+                  <div class="step-icon__cir" :class="`step-icon__cir-${stepFormat(item.status,s.value)}`"></div>
+                  <div class="step-icon__line" :class="`step-icon__line-${stepFormat(item.status,s.value)}`" v-if="si < status.length-1"></div>
+                </div>
+                <div class="step-label">{{ s.label }}</div>
+              </div>
+            </div>
+            <Button type="primary" size="small" class="list-item__btn" @click="stepClick(item,{},true)">查看</Button>
+            <Button type="primary" size="small" class="list-item__btn" @click="$emit('callback',item)">反馈</Button>
+          </div>
+        </transition-group>
+      </div>
+    </el-scrollbar>
   </div>
 </template>
 
 <script>
+import {deepCopy} from "@/utils";
+
 export default {
+  inject: ["transfers", "nowTime"],
   data() {
-    return {}
+    return {
+      status: [
+        {
+          value: 2,
+          label: "已接收"
+        },
+        {
+          value: 3,
+          label: "已开启通知"
+        },
+        {
+          value: 4,
+          label: "已开启"
+        },
+        {
+          value: 5,
+          label: "确认关闭通知"
+        },
+        {
+          value: 6,
+          label: "确认关闭"
+        },
+      ],
+      statusType: [
+        {
+          label: "存在执行中",
+          color: "linear-gradient(to top left,#527ded, #527ded43)",
+        },
+        {
+          label: "超时",
+          color: "linear-gradient(to top left,#d15d52, #d15d5243)"
+        },
+        {
+          label: "即将执行",
+          color: "linear-gradient(to top left,#ecc069, #ecc06943)"
+        }
+      ],
+
+      scrollTimer: null,
+      scrollList: [],
+      isMouseEnter: false,
+      isPaused: false,
+    }
+  },
+  methods: {
+    stepClick (item,s,isDetail=false) {
+      if (isDetail) {
+        this.$emit('step-click', {
+          data: item,
+          isDetail
+        })
+        return
+      }
+      const status = this.stepFormat(item.status,s.value)
+
+      if (status === 'doing') {
+        this.$emit('step-click', {
+          data: item,
+          isDetail
+        })
+      }
+    },
+  },
+  computed: {
+    time () {
+      return this.nowTime()
+    },
+    doing () {
+      return this.transfers("doing")
+    },
+
+    timeFormat () {
+      return function (time,format='YYYY-MM-DD HH:mm') {
+        return this.$moment(time).format(format)
+      }
+    },
+
+    timeStatusFormat () {
+      return function (item) {
+        //1 普通 2 进行中 3 倒计时 4 超时
+        const diffMins = this.$moment(item.end_time).diff(this.time,"minutes");
+        if (diffMins <= 5 && diffMins >= 0) {
+          return 3
+        }
+        if (this.doing.filter(i => (i.id === item.id))?.length > 1) {
+          return 2
+        }
+        if (diffMins < 0) {
+          return 4
+        }
+        return 1
+      }
+    },
+
+    stepFormat () {
+      return function (statue,s) {
+        const doneStatus = Array.from({ length: statue },((_,i) => (i + 1)))
+        if (statue === s) {
+          return "doing"
+        }
+        if (doneStatus.find(i => i === s)) {
+          return "done"
+        }
+        return false
+      }
+    },
+
   },
-  methods: {},
-  computed: {},
+  mounted() {
+  },
+  destroyed() {
+    clearInterval(this.scrollTimer)
+  },
+  watch: {
+    doing (newVal) {
+      if (newVal && newVal instanceof Array) {
+        this.scrollList = deepCopy(newVal)
+
+        this.$nextTick(() => {
+          const isScroll = this.$refs['listItems']?.$el?.getBoundingClientRect()?.height > this.$refs['elScrollbar']?.$el?.getBoundingClientRect()?.height;
+
+          if (isScroll) {
+            if (this.scrollTimer) {
+              clearInterval(this.scrollTimer)
+            }
+            this.scrollTimer = setInterval(() => {
+              if (!this.isPaused && !this.isMouseEnter) {
+                this.$refs['elScrollbar'].wrap.scrollTop = 0
+                this.scrollList.push(this.scrollList.shift())
+              }
+            },10000)
+          }
+        })
+      }
+    }
+  }
 }
 </script>
 
 <style scoped lang="scss">
+$container-height: calc((100vh - 8.46rem - 1.6rem * 3) / 2);
+$list-height: calc(#{$container-height} - 5.33rem);
+.container {
+  background: #FFFFFF;
+  box-shadow: 5px 0px 20px 0px #234382;
+  border-radius: 0.67rem;
+
+  position: relative;
+  margin: 1.6rem 3.62rem 0 3.62rem;
+}
+.list-item {
+  transition: all .4s;
+}
+.list-item-enter-from {
+  opacity: 0;
+}
+.header {
+  font-size: 1.15rem;
+  height: 5.33rem;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #F5F5F5;
+  border-radius: .67rem .67rem 0 0 ;
+
+  padding: 0 2rem;
+
+  p {
+    font-weight: 600;
+  }
+  .type {
+    display: flex;
+
+    &-item {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      margin-left: 2rem;
+      &__color {
+        width: 1.6rem;
+        height: 1.6rem;
+        border-radius: 3px;
+
+        margin-right: .6rem;
+      }
+      &__label {
+        font-weight: normal;
+      }
+    }
+  }
+}
+.list {
+  height: $list-height;
+
+  &-item {
+    font-size: 1.15rem;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px #fff solid;
+
+    padding: 1.2rem 2rem;
+
+    &:nth-last-child(1) {
+      border-radius: 0 0 .67rem .67rem;
+      border-bottom: none;
+    }
+
+    $bkg-colors: #fff,linear-gradient(to bottom,#527ded18, #527ded28),linear-gradient(to bottom,#ecc06918, #ecc06928),linear-gradient(to bottom,#d15d5218, #d15d5228);
+    @for $i from 1 through length($bkg-colors) {
+      &-#{$i} {
+        background: nth($bkg-colors,$i);
+
+        @if $i == 3 {
+          border: 1px solid #d15d52aa;
+          border-bottom: 1px solid #d15d52aa !important;
+
+          & + & {
+            border-top: none;
+          }
+        }
+      }
+    }
+    &__status {
+      display: flex;
+      align-items: center;
+      font-weight: 600;
+      flex-basis: 12%;
+
+      $font-colors: #333, #527ded, #ecc069,#d15d52;
+      $colors: #fff,linear-gradient(to top left,#527ded, #527ded43),linear-gradient(to top left,#ecc069, #ecc06943),linear-gradient(to top left,#d15d52, #d15d5243);
+      @for $i from 1 through length($colors) {
+        &-#{$i} {
+          background: nth($colors,$i);
+          width: 1.28rem;
+          height: 1.28rem;
+          border-radius: 3px;
+          & + p {
+            color: nth($font-colors,$i);
+          }
+        }
+      }
+    }
+    &__name {
+      font-weight: 600;
+      font-size: 1.34rem;
+      flex: 1;
+    }
+    &__time {
+      flex-basis: 19%;
+      text-align: center;
+    }
+    &__last {
+      flex-basis: 7%;
+      text-align: center;
+    }
+    &__operate {
+      flex-basis: 31%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .step {
+        width: 6.6rem;
+
+        &-icon {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          position: relative;
+
+          &__cir {
+            width: 2.2rem;
+            height: 2.2rem;
+            background: #dcdcdc;
+            border-radius: 100%;
+
+            z-index: 2;
+            position: relative;
+            &-doing {
+              cursor: pointer;
+              transform: scale(.9, .9);
+              background: #6fc0af;
+
+              position: relative;
+
+              &::before {
+                content: "";
+                width: 132%;
+                height: 132%;
+                border-radius: 100%;
+                background: #6fc0af65;
+                transform: translate(-50%,-50%);
+                animation: scale infinite ease-out 4s;
+
+                position: absolute;
+                left: 50%;
+                top: 50%;
+              }
+              @keyframes scale {
+                0%,100% {
+                  transform: translate(-50%,-50%);
+                }
+                50% {
+                  transform: translate(-50%,-50%) scale(1.1,1.1);
+                }
+              }
+            }
+            &-done {
+              background: #7ccac8;
+            }
+          }
+          &__line {
+            width: 100%;
+            height: 2px;
+            background: #dcdcdc;
+
+            position: absolute;
+            left: 50%;
+
+            &-done {
+              background: #7ccac8;
+            }
+          }
+
+        }
+        &-label {
+          text-align: center;
+          font-size: 1.05rem;
+          line-height: 1.5;
+
+          margin-top: 4px;
+        }
+      }
+    }
+    &__btn {
+      font-size: 1.3rem;
+      height: 2.4rem;
+      width: 5rem;
+      background: #a4ddf0;
+      color: #333;
+      border-color: #a4ddf0;
+    }
+  }
+}
 </style>
diff --git a/src/views/bigScreen1/component/done.vue b/src/views/bigScreen1/component/done.vue
new file mode 100644
index 0000000..cf619ab
--- /dev/null
+++ b/src/views/bigScreen1/component/done.vue
@@ -0,0 +1,387 @@
+<template>
+  <div>
+    <el-drawer title=" "
+               :modal="false"
+               :visible.sync="drawer"
+               direction="rtl"
+               size="74%">
+      <div class="container">
+        <div class="header">
+          <p>已完成</p>
+
+        </div>
+
+        <el-scrollbar ref="elScrollbar" class="scrollbar-wrapper">
+          <div class="list">
+            <div v-for="(item, index) in done" :key="item.id" ref="listItem" class="list-item">
+<!--              <div class="list-item__status">-->
+<!--                <template v-if="timeStatusFormat(item) === 2">-->
+<!--                  <div class="list-item__status-2"></div>-->
+<!--                  <p>【存在执行中指令】</p>-->
+<!--                </template>-->
+<!--                <template v-else-if="timeStatusFormat(item) === 3">-->
+<!--                  <div class="list-item__status-3"></div>-->
+<!--                  <p>【倒计时{{ $moment(item.start_time).diff($moment(time),'minutes') }}分钟】</p>-->
+<!--                </template>-->
+<!--                <template v-else-if="timeStatusFormat(item) === 4">-->
+<!--                  <div class="list-item__status-4"></div>-->
+<!--                  <p>【超时未执行】</p>-->
+<!--                </template>-->
+<!--                <template v-else>-->
+
+<!--                </template>-->
+<!--              </div>-->
+              <div class="list-item__name">
+                {{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}
+              </div>
+              <div class="list-item__time">
+                实际执行时间：{{ timeFormat(item.act_start_time) }}至{{ timeFormat(item.act_end_time,'HH:mm') }}
+              </div>
+              <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时</div>
+              <div class="list-item__operate">
+                <div v-for="(s, si) in status" class="step">
+                  <div class="step-icon">
+                    <div class="step-icon__cir" :class="`step-icon__cir-${stepFormat(item.status,s.value)}`"></div>
+                    <div class="step-icon__line" :class="`step-icon__line-${stepFormat(item.status,s.value)}`" v-if="si < status.length-1"></div>
+                  </div>
+                  <div class="step-label">{{ s.label }}</div>
+                </div>
+              </div>
+              <Button type="primary" size="small" class="list-item__btn" @click="stepClick(item,{},true)">查看</Button>
+            </div>
+          </div>
+        </el-scrollbar>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  inject: ["transfers", "nowTime"],
+  data() {
+    return {
+      status: [
+        {
+          value: 2,
+          label: "接收"
+        },
+        {
+          value: 3,
+          label: "通知开机"
+        },
+        {
+          value: 4,
+          label: "开机"
+        },
+        {
+          value: 5,
+          label: "通知关机"
+        },
+        {
+          value: 6,
+          label: "关机"
+        },
+      ],
+      statusType: [
+        {
+          label: "存在执行中",
+          color: "linear-gradient(to top left,#527ded, #527ded43)",
+        },
+        {
+          label: "超时",
+          color: "linear-gradient(to top left,#d15d52, #d15d5243)"
+        },
+        {
+          label: "即将执行",
+          color: "linear-gradient(to top left,#ecc069, #ecc06943)"
+        }
+      ],
+      drawer: false,
+    }
+  },
+  methods: {
+    show () {
+      this.drawer = true;
+    },
+    hide () {
+      this.drawer = false;
+    },
+    stepClick (item,s,isDetail=false) {
+      if (isDetail) {
+        this.$emit('step-click', {
+          data: item,
+          isDetail
+        })
+        return
+      }
+      const status = this.stepFormat(item.status,s.value)
+
+      if (status === 'doing') {
+        this.$emit('step-click', {
+          data: item,
+          isDetail
+        })
+      }
+    },
+  },
+  computed: {
+    time () {
+      return this.nowTime()
+    },
+    done () {
+      return this.transfers("done")
+    },
+
+    timeFormat () {
+      return function (time,format='YYYY-MM-DD HH:mm') {
+        return this.$moment(time).format(format)
+      }
+    },
+
+    timeStatusFormat () {
+      return function (item) {
+        //1 普通 2 进行中 3 倒计时 4 超时
+        if (item.status === 3) {
+          return 2
+        }
+        const diffMins = this.$moment(item.start_time).diff(this.time,"minutes");
+        if (diffMins <= 5 && diffMins >= 0) {
+          return 3
+        }
+        if (diffMins < 0) {
+          return 4
+        }
+        return 1
+      }
+    },
+
+    stepFormat () {
+      return function (statue,s) {
+        const doneStatus = Array.from({ length: statue },((_,i) => (i + 1)))
+        if (statue === s) {
+          return "doing"
+        }
+        if (doneStatus.find(i => i === s)) {
+          return "done"
+        }
+        return false
+      }
+    },
+
+  },
+}
+</script>
+
+<style scoped lang="scss">
+$container-height: 60vh;
+$list-height: calc(#{$container-height} - 5.33rem);
+.container {
+  background: #FFFFFF;
+  box-shadow: 5px 0px 20px 0px #234382;
+  border-radius: 0.67rem;
+
+  position: relative;
+  margin: 4rem 3.62rem 0 3.62rem;
+}
+.header {
+  font-size: 1.15rem;
+  height: 5.33rem;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #F5F5F5;
+  border-radius: .67rem .67rem 0 0 ;
+
+  padding: 0 2rem;
+
+  p {
+    font-weight: 600;
+  }
+  .type {
+    display: flex;
+
+    &-item {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      margin-left: 2rem;
+      &__color {
+        width: 1.6rem;
+        height: 1.6rem;
+        border-radius: 3px;
+
+        margin-right: .6rem;
+      }
+      &__label {
+        font-weight: normal;
+      }
+    }
+  }
+}
+.list {
+  max-height: $list-height;
+
+  &-item {
+    font-size: 1.15rem;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px #fff solid;
+
+    padding: 1.2rem 2rem;
+
+    &:nth-last-child(1) {
+      border-radius: 0 0 .67rem .67rem;
+      border-bottom: none;
+    }
+
+    $bkg-colors: #fff,linear-gradient(to bottom,#527ded18, #527ded28),linear-gradient(to bottom,#ecc06918, #ecc06928),linear-gradient(to bottom,#d15d5218, #d15d5228);
+    @for $i from 1 through length($bkg-colors) {
+      &-#{$i} {
+        background: nth($bkg-colors,$i);
+
+        @if $i == 3 {
+          border: 1px solid #d15d52aa;
+          border-bottom: 1px solid #d15d52aa !important;
+          animation: shine 2s infinite ease-out;
+
+          & + & {
+            border-top: none;
+          }
+        }
+      }
+    }
+    @keyframes shine {
+      from {
+        filter: drop-shadow(0 0 1px rgba(227, 92, 79, 0.67));
+      }
+      to {
+        filter: drop-shadow(0 0 4px #d15d52aa);
+      }
+    }
+    &__status {
+      display: flex;
+      align-items: center;
+      font-weight: 600;
+      flex-basis: 12%;
+
+      $font-colors: #333, #527ded, #ecc069,#d15d52;
+      $colors: #fff,linear-gradient(to top left,#527ded, #527ded43),linear-gradient(to top left,#ecc069, #ecc06943),linear-gradient(to top left,#d15d52, #d15d5243);
+      @for $i from 1 through length($colors) {
+        &-#{$i} {
+          background: nth($colors,$i);
+          width: 1.28rem;
+          height: 1.28rem;
+          border-radius: 3px;
+          & + p {
+            color: nth($font-colors,$i);
+          }
+        }
+      }
+    }
+    &__name {
+      font-weight: 600;
+      font-size: 1.34rem;
+      flex: 1;
+    }
+    &__time {
+      flex-basis: 26%;
+      text-align: center;
+    }
+    &__last {
+      flex-basis: 9%;
+      text-align: center;
+    }
+    &__operate {
+      flex-basis: 31%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .step {
+        width: 6.6rem;
+
+        &-icon {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          position: relative;
+
+          &__cir {
+            width: 2.2rem;
+            height: 2.2rem;
+            background: #dcdcdc;
+            border-radius: 100%;
+
+            z-index: 2;
+            position: relative;
+            &-doing {
+              cursor: pointer;
+              transform: scale(.9, .9);
+              background: #6fc0af;
+
+              position: relative;
+
+              &::before {
+                content: "";
+                width: 132%;
+                height: 132%;
+                border-radius: 100%;
+                background: #6fc0af65;
+                transform: translate(-50%,-50%);
+                animation: scale infinite ease-out 4s;
+                transform-origin: 50% 50%;
+
+                position: absolute;
+                left: 50%;
+                top: 50%;
+              }
+              @keyframes scale {
+                0%,100% {
+                  transform: translate(-50%,-50%);
+                }
+                50% {
+                  transform: translate(-50%,-50%) scale(1.08, 1.08);
+                }
+              }
+            }
+            &-done {
+              background: #7ccac8;
+            }
+          }
+          &__line {
+            width: 100%;
+            height: 2px;
+            background: #dcdcdc;
+
+            position: absolute;
+            left: 50%;
+
+            &-done {
+              background: #7ccac8;
+            }
+          }
+
+        }
+        &-label {
+          text-align: center;
+          font-size: 1.05rem;
+          line-height: 1.5;
+
+          margin-top: 4px;
+        }
+      }
+    }
+    &__btn {
+      font-size: 1.3rem;
+      height: 2.4rem;
+      width: 5rem;
+      background: #a4ddf0;
+      color: #333;
+      border-color: #a4ddf0;
+    }
+  }
+}
+</style>
diff --git a/src/views/bigScreen1/component/title.vue b/src/views/bigScreen1/component/title.vue
index 9bcbccd..37e9bf2 100644
--- a/src/views/bigScreen1/component/title.vue
+++ b/src/views/bigScreen1/component/title.vue
@@ -4,7 +4,7 @@
 
     <div class="bottom">
       <div>{{ $moment(time).format('YYYY-MM-DD HH:mm:ss') }}</div>
-      <div>查看已完成调令 <i class="el-icon-d-arrow-right"></i></div>
+      <div @click="$emit('show-done')">当日已完成调令 <i class="el-icon-d-arrow-right"></i></div>
     </div>
   </div>
 </template>
@@ -42,7 +42,7 @@ export default {
     font-weight: 400;
     color: #FFFFFF;
 
-    padding: 2.87rem 0 0 1.33rem;
+    padding: 2.87rem 0 0 0;
   }
 
   .bottom {
@@ -56,4 +56,5 @@ export default {
     padding: 0 5.73rem;
   }
 }
+$title-height: 8.46rem;
 </style>
diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue
index b6172f1..45a550d 100644
--- a/src/views/bigScreen1/component/toDo.vue
+++ b/src/views/bigScreen1/component/toDo.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="container">
+  <div class="container" @mouseenter="isMouseEnter = true" @mouseleave="isMouseEnter = false">
     <div class="header">
-      <p>代执行</p>
+      <p>待执行</p>
 
       <div class="type">
         <div class="type-item" v-for="item in statusType">
@@ -11,50 +11,60 @@
       </div>
     </div>
 
-    <el-scrollbar>
+    <el-scrollbar ref="elScrollbar" class="scrollbar-wrapper">
       <div class="list">
-        <div v-for="(item, index) in toDo" :key="item.id" class="list-item" :class="`list-item-${timeStatusFormat(item)}`">
-          <div class="list-item__status">
-            <template v-if="timeStatusFormat(item) === 2">
-              <div class="list-item__status-2"></div>
-              <p>【存在执行中指令】</p>
-            </template>
-            <template v-else-if="timeStatusFormat(item) === 3">
-              <div class="list-item__status-3"></div>
-              <p>【倒计时{{ $moment(item.start_time).diff($moment(time),'minutes') }}分钟】</p>
-            </template>
-            <template v-else-if="timeStatusFormat(item) === 4">
-              <div class="list-item__status-4"></div>
-              <p>【超时未执行】</p>
-            </template>
-            <template v-else>
-
-            </template>
-          </div>
-          <div class="list-item__name">
-            {{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}
-          </div>
-          <div class="list-item__time">
-            执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
-          </div>
-          <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时</div>
-          <div class="list-item__operate">
-            <div v-for="(s, si) in status" class="step">
-              <div class="step-icon">
-                <div class="step-icon__cir" :class="`step-icon__cir-${stepFormat(item.status,s.value)}`"></div>
-                <div class="step-icon__line" :class="`step-icon__line-${stepFormat(item.status,s.value)}`" v-if="si < status.length-1"></div>
+        <transition-group name="list-item" ref="listItems">
+          <div v-for="(item, index) in scrollList" :key="item.id" ref="listItem" class="list-item" :class="`list-item-${timeStatusFormat(item)}`">
+            <div class="list-item__status">
+              <template v-if="timeStatusFormat(item) === 2">
+                <div class="list-item__status-2"></div>
+                <p>【存在执行中指令】</p>
+              </template>
+              <template v-else-if="timeStatusFormat(item) === 3">
+                <div class="list-item__status-3"></div>
+                <p>【倒计时{{ $moment(item.start_time).diff($moment(time),'minutes') }}分钟】</p>
+              </template>
+              <template v-else-if="timeStatusFormat(item) === 4">
+                <div class="list-item__status-4"></div>
+                <p>【超时未执行】</p>
+              </template>
+              <template v-else>
+
+              </template>
+            </div>
+            <div class="list-item__name">
+              {{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}
+            </div>
+            <div class="list-item__content">
+              <el-tooltip class="item" effect="dark" :content="item.content" placement="top-start">
+                <span>{{ item.content }}</span>
+              </el-tooltip>
+            </div>
+            <div class="list-item__time">
+              执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
+            </div>
+            <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时</div>
+            <div class="list-item__operate">
+              <div v-for="(s, si) in status" class="step" @click="stepClick(item,s)">
+                <div class="step-icon">
+                  <div class="step-icon__cir" :class="`step-icon__cir-${stepFormat(item.status,s.value)}`"></div>
+                  <div class="step-icon__line" :class="`step-icon__line-${stepFormat(item.status,s.value)}`" v-if="si < status.length-1"></div>
+                </div>
+                <div class="step-label">{{ s.label }}</div>
               </div>
-              <div class="step-label">{{ s.label }}</div>
             </div>
+            <Button type="primary" size="small" class="list-item__btn" @click="stepClick(item,{},true)">查看</Button>
+            <Button type="primary" size="small" class="list-item__btn" @click="$emit('callback',item)">反馈</Button>
           </div>
-          <Button type="primary" size="small" class="list-item__btn">查看</Button>
-        </div>
+        </transition-group>
       </div>
     </el-scrollbar>
   </div>
 </template>
 
 <script>
+import { deepCopy } from "@/utils";
+
 export default {
   inject: ["transfers", "nowTime"],
   data() {
@@ -62,23 +72,23 @@ export default {
       status: [
         {
           value: 2,
-          label: "已接收"
+          label: "接收"
         },
         {
           value: 3,
-          label: "已开启通知"
+          label: "通知开机"
         },
         {
           value: 4,
-          label: "已开启"
+          label: "开机"
         },
         {
           value: 5,
-          label: "确认关闭通知"
+          label: "通知关机"
         },
         {
           value: 6,
-          label: "确认关闭"
+          label: "关机"
         },
       ],
       statusType: [
@@ -94,16 +104,40 @@ export default {
           label: "即将执行",
           color: "linear-gradient(to top left,#ecc069, #ecc06943)"
         }
-      ]
+      ],
+
+
+      scrollTimer: null,
+      scrollList: [],
+      isMouseEnter: false,
+      isPaused: false,
     }
   },
-  methods: {},
+  methods: {
+    stepClick (item,s,isDetail=false) {
+      if (isDetail) {
+        this.$emit('step-click', {
+          data: item,
+          isDetail
+        })
+        return
+      }
+      const status = this.stepFormat(item.status,s.value)
+
+      if (status === 'doing') {
+        this.$emit('step-click', {
+          data: item,
+          isDetail
+        })
+      }
+    },
+
+  },
   computed: {
     time () {
       return this.nowTime()
     },
     toDo () {
-      console.log(this.transfers("toDo"))
       return this.transfers("toDo")
     },
 
@@ -116,13 +150,13 @@ export default {
     timeStatusFormat () {
       return function (item) {
         //1 普通 2 进行中 3 倒计时 4 超时
-        if (item.status === 3) {
-          return 2
-        }
         const diffMins = this.$moment(item.start_time).diff(this.time,"minutes");
         if (diffMins <= 5 && diffMins >= 0) {
           return 3
         }
+        if (this.toDo.filter(i => (i.id === item.id))?.length > 1) {
+          return 2
+        }
         if (diffMins < 0) {
           return 4
         }
@@ -141,12 +175,43 @@ export default {
         }
         return false
       }
-    }
+    },
+
+  },
+  mounted() {
   },
+  destroyed() {
+    clearInterval(this.scrollTimer)
+  },
+  watch: {
+    toDo (newVal) {
+      if (newVal && newVal instanceof Array) {
+        this.scrollList = deepCopy(newVal)
+
+        this.$nextTick(() => {
+          const isScroll = this.$refs['listItems']?.$el?.getBoundingClientRect()?.height > this.$refs['elScrollbar']?.$el?.getBoundingClientRect()?.height;
+
+          if (isScroll) {
+            if (this.scrollTimer) {
+              clearInterval(this.scrollTimer)
+            }
+            this.scrollTimer = setInterval(() => {
+              if (!this.isPaused && !this.isMouseEnter) {
+                this.$refs['elScrollbar'].wrap.scrollTop = 0
+                this.scrollList.push(this.scrollList.shift())
+              }
+            },10000)
+          }
+        })
+      }
+    }
+  }
 }
 </script>
 
 <style scoped lang="scss">
+$container-height: calc((100vh - 8.46rem - 1.6rem * 3) / 2);
+$list-height: calc(#{$container-height} - 5.33rem);
 .container {
   background: #FFFFFF;
   box-shadow: 5px 0px 20px 0px #234382;
@@ -155,6 +220,12 @@ export default {
   position: relative;
   margin: 1.6rem 3.62rem 0 3.62rem;
 }
+.list-item {
+  transition: all .4s;
+}
+.list-item-enter-from {
+  opacity: 0;
+}
 .header {
   font-size: 1.15rem;
   height: 5.33rem;
@@ -192,7 +263,7 @@ export default {
   }
 }
 .list {
-  max-height: 56rem;
+  height: $list-height;
 
   &-item {
     font-size: 1.15rem;
@@ -226,7 +297,7 @@ export default {
       display: flex;
       align-items: center;
       font-weight: 600;
-      flex-basis: 10%;
+      flex-basis: 12%;
 
       $font-colors: #333, #527ded, #ecc069,#d15d52;
       $colors: #fff,linear-gradient(to top left,#527ded, #527ded43),linear-gradient(to top left,#ecc069, #ecc06943),linear-gradient(to top left,#d15d52, #d15d5243);
@@ -247,16 +318,22 @@ export default {
       font-size: 1.34rem;
       flex: 1;
     }
+    &__content {
+      flex-basis: 14%;
+      word-break: keep-all;
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
     &__time {
       flex-basis: 19%;
       text-align: center;
     }
     &__last {
-      flex-basis: 7%;
+      flex-basis: 6%;
       text-align: center;
     }
     &__operate {
-      flex-basis: 31%;
+      flex-basis: 30%;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -271,6 +348,8 @@ export default {
 
           position: relative;
 
+          $done-color: #ec6a5e;
+          $doing-color: #7ccac8;
           &__cir {
             width: 2.2rem;
             height: 2.2rem;
@@ -282,7 +361,7 @@ export default {
             &-doing {
               cursor: pointer;
               transform: scale(.9, .9);
-              background: #6fc0af;
+              background: $doing-color;
 
               position: relative;
 
@@ -291,7 +370,8 @@ export default {
                 width: 132%;
                 height: 132%;
                 border-radius: 100%;
-                background: #6fc0af65;
+                opacity: 0.4;
+                background: $doing-color;
                 transform: translate(-50%,-50%);
                 animation: scale infinite ease-out 4s;
 
@@ -309,7 +389,7 @@ export default {
               }
             }
             &-done {
-              background: #7ccac8;
+              background: $done-color;
             }
           }
           &__line {
@@ -321,7 +401,7 @@ export default {
             left: 50%;
 
             &-done {
-              background: #7ccac8;
+              background: $done-color;
             }
           }
 
@@ -346,3 +426,10 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+#app:has(#big-screen) {
+  .scrollbar-wrapper {
+    border-radius: 0 0 0.67rem 0.67rem;
+  }
+}
+</style>
diff --git a/src/views/bigScreen1/index.vue b/src/views/bigScreen1/index.vue
index 3f51d13..2fcd3d5 100644
--- a/src/views/bigScreen1/index.vue
+++ b/src/views/bigScreen1/index.vue
@@ -1,25 +1,49 @@
 <template>
   <div id="big-screen" ref="appRef">
     <topBackground></topBackground>
-    <Title></Title>
-    <toDo></toDo>
-    <doing></doing>
+    <Title @show-done="$refs['done'].show()"></Title>
+    <toDo ref="toDo"
+          @step-click="stepClick"
+          @callback="e => {
+             $refs['callback'].setId(e.id)
+             $refs['callback'].setType('add')
+             $refs['callback'].show()
+           }"></toDo>
+    <doing ref="doing"
+           @step-click="stepClick"
+           @callback="e => {
+             $refs['callback'].setId(e.id)
+             $refs['callback'].setType('add')
+             $refs['callback'].show()
+           }"></doing>
+    <done ref="done" @step-click="stepClick"></done>
+    <detailTransfer ref="detailTransfer"
+                    @start="start"
+                    @pause="pause"
+                    @refresh="getTransfer(true)"></detailTransfer>
+    <callback ref="callback"></callback>
   </div>
 </template>
 
 <script>
+import callback from "@/views/bigScreen1/component/callback.vue";
 import topBackground from "@/views/bigScreen1/component/topBackground.vue";
 import Title from "@/views/bigScreen1/component/title.vue";
 import toDo from "@/views/bigScreen1/component/toDo.vue";
 import doing from "@/views/bigScreen1/component/doing.vue";
+import done from "@/views/bigScreen1/component/done.vue";
+import detailTransfer from "@/views/bigScreen1/component/detailTransfer.vue";
 import { index } from "@/api/system/baseForm";
 import { refreshTransferTime } from "@/settings";
 export default {
   components: {
+    callback,
     topBackground,
     Title,
     toDo,
-    doing
+    doing,
+    done,
+    detailTransfer
   },
   provide() {
     return {
@@ -51,6 +75,22 @@ export default {
     }
   },
   methods: {
+    start () {
+      this.$refs['toDo'].isPaused = false;
+      this.$refs['doing'].isPaused = false;
+      console.log('start',this.$refs['toDo'].isPaused)
+    },
+    pause () {
+      this.$refs['toDo'].isPaused = true;
+      this.$refs['doing'].isPaused = true;
+      console.log('pause',this.$refs['toDo'].isPaused)
+    },
+    stepClick ({ data, isDetail }) {
+      this.$refs['detailTransfer'].setData(data);
+      this.$refs['detailTransfer'].readonly = isDetail;
+      this.$refs['detailTransfer'].show();
+    },
+
     startTime () {
       this.timer = setInterval(() => {
         this.time = this.$moment()
@@ -68,14 +108,16 @@ export default {
     async getTransfer(isFirst = false) {
       if (isFirst) {
         this.forwardRefreshTime = this.$moment();
-        this.transfers1 = [];
-        this.transfers2 = [];
-        this.transfers3 = [];
+        let transfers1 = [];
+        let transfers2 = [];
+        let transfers3 = [];
         const res = (
           await index({
             table_name: "transfers",
             page: 1,
             page_size: 9999,
+            sort_name: "start_time",
+            sort_type: "asc",
             filter: [
               {
                 key: 'start_time',
@@ -91,16 +133,19 @@ export default {
           },false)
         ).data;
         res.forEach(i => {
-          if (i.status === 2 || i.status === 3) {
-            this.transfers1.push(i)
+          if (i.status === 2 || i.status === 3 || i.status === 4) {
+            transfers1.push(i)
           }
-          if (i.status === 4 || i.status === 5) {
-            this.transfers2.push(i)
+          if (i.status === 5 || i.status === 6) {
+            transfers2.push(i)
           }
-          if (i.status === 6) {
-            this.transfers3.push(i)
+          if (i.status === 7) {
+            transfers3.push(i)
           }
         })
+        this.transfers1 = transfers1;
+        this.transfers2 = transfers2;
+        this.transfers3 = transfers3;
       } else {
         const res = (
           (await index({
@@ -115,8 +160,8 @@ export default {
                 },
                 {
                   key: "status",
-                  op: "range",
-                  value: "2,3"
+                  op: "eq",
+                  value: "2"
                 }
               ]
             },false)
@@ -151,8 +196,7 @@ export default {
 
 <style scoped lang="scss">
 #big-screen {
-  overflow-y: scroll;
-  overflow-x: hidden;
+  overflow: hidden;
   width: 100vw;
   height: 100vh;
 
diff --git a/src/views/component/detail.vue b/src/views/component/detail.vue
index 75a8ceb..d423696 100644
--- a/src/views/component/detail.vue
+++ b/src/views/component/detail.vue
@@ -147,7 +147,7 @@ export default {
 
         Promise.all(promiseAll).then(res => {
           if (item.edit_input !== 'files') {
-            let dataTable = this.allTables.find(t => t.table_name === res[1].relation[0].link_table_name);
+            let dataTable = this.allTables.find(t => t.table_name === res[1]?.relation[0]?.link_table_name);
             if (dataTable) {
               formShow({ id: dataTable?.id }).then(res1 => {
                 this.linkTableList.push({
@@ -224,7 +224,7 @@ export default {
         ['admins',[]]
       ])
       let { fields, relation } = info;
-      let fieldRes = fields.sort((a,b) => a.sort - b.sort)
+      let fieldRes = fields.sort((a,b) => a.sort - b.sort).filter(i => i.list_show)
       if (
         !fields ||
         !relation ||
@@ -467,8 +467,7 @@ export default {
 
   computed: {
     showFields () {
-      console.log(this.fields)
-      return this.fields.filter(field => (!field._relations || field._relations.link_relation === 'hasOne' || field._relations.link_relation === 'newHasOne'))
+      return this.fields.filter(field => (!field._relations || field._relations.link_relation === 'hasOne' || field._relations.link_relation === 'newHasOne')).filter(i => i.list_show)
     },
     contentFormat() {
       return function (i) {
diff --git a/src/views/order/component/createDispatch.vue b/src/views/order/component/createDispatch.vue
index 4e58000..f85caf9 100644
--- a/src/views/order/component/createDispatch.vue
+++ b/src/views/order/component/createDispatch.vue
@@ -70,7 +70,7 @@
         <el-popover
           placement="top-start"
           title="模板"
-          width="300"
+          width="360"
           trigger="click"
           @show="getTemplates"
         >
@@ -121,8 +121,9 @@
 </template>
 
 <script>
+import { equipmentInfos } from "@/api/other"
 import { uuid } from "@/utils";
-import { index, save } from "@/api/system/baseForm";
+import { index, save, destroy } from "@/api/system/baseForm";
 import { deepCopy } from "@/utils";
 import { mergeTableRow } from "@/utils/mergeTableRow";
 import { show } from "@/api/system/customFormField";
@@ -131,6 +132,7 @@ export default {
   props: {},
   data() {
     return {
+      equipmentInfos: { shuniu: [], waiwei: [], zhazhan: [] },
       templateLoading: false,
       templates: [],
       templateTotal: 0,
@@ -142,32 +144,65 @@ export default {
       templateTable: [
         {
           type: "index",
-          width: 46,
+          width: 44,
           title: " ",
         },
         {
           title: "名称",
           key: "name",
+          width: 140,
         },
         {
           title: "操作",
           key: "operate",
+          minWidth: 120,
           render: (h, { row }) =>
-            h(
-              "Button",
-              {
-                props: {
-                  type: "primary",
-                  size: "small",
-                },
-                on: {
-                  ["click"]: (_) => {
-                    this.handleClone(JSON.parse(row.content))
+            h('div',{
+
+            },[
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  on: {
+                    ["click"]: (_) => {
+                      this.handleClone(JSON.parse(row.content))
+                    },
                   },
                 },
-              },
-              "选择"
-            ),
+                "选择"
+              ),
+              h(
+                'Button',
+                {
+                  props: {
+                    type: "error",
+                    size: "small"
+                  },
+                  on: {
+                    ['click']:async _ => {
+                      try {
+                        await this.$confirm('此操作将永久删除该模板, 是否继续?', '提示', {
+                          confirmButtonText: '确定',
+                          cancelButtonText: '取消',
+                          type: 'warning'
+                        })
+                      } catch (e) {
+
+                      }
+                      await destroy({
+                        table_name: 'transfer_templates',
+                        id: row.id
+                      })
+                      await this.getTemplates()
+                    }
+                  }
+                }, "删除"
+              )
+            ])
         },
       ],
 
@@ -376,15 +411,39 @@ export default {
           title: "机组运行状态",
           width: 200,
           render: (h, { row }) => {
+            let name = row.equipment.name;
+            let type = row.equipment.type;
             const create = () => {
               let dom = [];
-              for (let i = 0; i <= row._random; i++) {
+              let cirs = []
+              if (type === 2 || type === 3) {
+                const datas = this.equipmentInfos.shuniu.find(i => (name === i.stnm) )?.data[0]
+                if (datas) {
+                  let values = datas.Value?.split('.')
+                  values.forEach(i => {
+                    cirs.push(Number(i))
+                  })
+                }
+              }
+              if (type === 1) {
+                const datas = this.equipmentInfos.zhazhan.find(i => (name === i.STNMNEW || name === i.STNM) )?.data[0]
+                if (datas) {
+                  Object.keys(datas).forEach(key => {
+                    if (/PUMP+/.test(key)) {
+                      if (datas[key]) {
+                        cirs.push(Number(datas[key]))
+                      }
+                    }
+                  })
+                }
+              }
+              for (let i = 0; i < cirs.length; i++) {
                 dom.push(
                   h("div", {
                     style: {
                       width: "14px",
                       height: "14px",
-                      background: i === row._random - 1 ? "red" : "green",
+                      background: cirs[i] ? "green" : "red",
                       "border-radius": "100%",
                       "margin-left": "6px",
                     },
@@ -620,6 +679,13 @@ export default {
     };
   },
   methods: {
+    async getEquipmentInfos () {
+      const res = await equipmentInfos({
+        date: this.date
+      })
+      this.equipmentInfos = res
+    },
+
     handleClone (content) {
       if (!content) return;
 
@@ -826,6 +892,7 @@ export default {
             type: "success",
             message: `成功创建${res.length}条调令`,
           });
+          this.$emit("createdTransfer")
           this.$bus.$emit("createdTransfer");
 
           if (isNeed) {
@@ -970,6 +1037,7 @@ export default {
     this.getArea();
     this.getType();
     this.getAbility();
+    this.getEquipmentInfos();
   },
   destroyed() {
     this.$bus.$off("getDispatches");
diff --git a/src/views/order/component/dispatchList.vue b/src/views/order/component/dispatchList.vue
index 87b8c1f..534dea3 100644
--- a/src/views/order/component/dispatchList.vue
+++ b/src/views/order/component/dispatchList.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <div class="select-content">
+      <Button type="primary" @click="cloneTemplate">创建模板</Button>
       <el-date-picker
         size="small"
         :clearable="false"
@@ -8,7 +9,7 @@
         value-format="yyyy-MM-dd"
         placeholder="日期选择"
         format="yyyy-MM-dd"
-        style="width: 130px;"
+        style="width: 130px;margin-left: 6px;"
       ></el-date-picker>
       <Select clearable v-model="select.filter[2].value" placeholder="请选择类别" style="width: 140px;margin-left: 6px;">
         <Option v-for="item in abilities" :value="item.value">{{ item.key }}</Option>
@@ -18,9 +19,12 @@
       </Select>
       <Input style="width: 140px;margin-left: 6px;" clearable v-model="select.filter[0].value" placeholder="搜索内容"/>
       <Button style="margin-left: 6px;" type="primary" @click="getDispatches">搜索</Button>
+      <Button type="primary" @click="pickNoDistribute">勾选当日未下发</Button>
+      <Button type="primary" @click="distributeTransfers">批量下发</Button>
     </div>
 
     <Table
+      ref="listTable"
       style="margin-top: 16px;"
       border
       :loading="loading"
@@ -47,18 +51,43 @@
 <!--      layout="total, prev, pager, next, jumper, sizes"-->
 <!--      :total="total">-->
 <!--    </el-pagination>-->
+    <callback ref="callback" @refresh="getDispatches"></callback>
+    <dialoger
+      :table-name="customForm.tableName"
+      :form-info="form"
+      ref="dialog"
+      @refresh="$refs['xyTable'].getTableData()"
+    >
+    </dialoger>
   </div>
 </template>
 
 <script>
+import callback from "@/views/order/component/callback.vue";
 import { deepCopy } from "@/utils";
-import { index,destroy } from "@/api/system/baseForm";
+import { index, destroy, save } from "@/api/system/baseForm";
 import { mergeTableRow }  from "@/utils/mergeTableRow";
+import { getOaToken } from "@/api/other";
+import dialoger from "@/views/component/dialog.vue";
+import {show} from "@/api/system/customForm";
+import {listdept} from "@/api/system/department";
+import {getparameter} from "@/api/system/dictionary";
 
 export default {
+  components: {
+    dialoger,
+    callback
+  },
   inject: ["equipments"],
   data() {
     return {
+      oaToken: "",
+      window: {
+        width: 0,
+        height: 0,
+        top: 0,
+        left: 0
+      },
       loading: false,
       areas: [],
       abilities: [],
@@ -89,6 +118,10 @@ export default {
       total: 0,
       data: [],
       columns: [
+        {
+          width: 54,
+          type: "selection"
+        },
         {
           title: "范围",
           width: 140,
@@ -150,51 +183,366 @@ export default {
         },
         {
           title: "操作",
-          width: 140,
+          minWidth: 310,
           key: "operate",
           render: (h, { row, index }) => {
-            return h(
-              "Poptip",
-              {
-                props: {
-                  title: "确认要删除吗？",
-                  confirm: true,
-                  transfer: true,
-                },
-                on: {
-                  ["on-ok"]: (e) => {
-                    destroy({
-                      table_name: 'transfers',
-                      id: row.id
-                    }).then(res => {
-                      this.$message({
-                        type: 'success',
-                        message: '删除成功'
+            const btnMap = new Map([
+              ['delete',h(
+                "Poptip",
+                {
+                  props: {
+                    title: "确认要删除吗？",
+                    confirm: true,
+                    transfer: true,
+                  },
+                  on: {
+                    ["on-ok"]: (e) => {
+                      destroy({
+                        table_name: 'transfers',
+                        id: row.id
+                      }).then(res => {
+                        this.$message({
+                          type: 'success',
+                          message: '删除成功'
+                        })
+                        this.getDispatches();
                       })
-                      this.getDispatches();
-                    })
+                    },
                   },
                 },
-              },
+                [
+                  h(
+                    "Button",
+                    {
+                      style: {
+                        'margin-left': "6px"
+                      },
+                      props: {
+                        type: "error",
+                        size: "small",
+                      },
+                    },
+                    "删除"
+                  ),
+                ]
+              )],
               [
-                h(
+                'edit',h(
                   "Button",
                   {
+                    style: {
+                      'margin-left': '6px'
+                    },
                     props: {
                       type: "primary",
                       size: "small",
                     },
+                    on: {
+                      click:() => {
+                        this.$refs['dialog'].setId(row.id);
+                        this.$refs['dialog'].setType('editor');
+                        this.$refs['dialog'].show();
+                      }
+                    }
+                  },
+                  "编辑"
+              ),
+              ],
+              ['oa',h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  on: {
+                    'click': async () => {
+                      if (!this.oaToken) {
+                        this.oaToken = (await getOaToken()).oatoken
+                      }
+                      let jsonInfo = {
+                        'title': row.equipment_id_equipments_id_relation?.name,
+                        '65aa1a59e408c': row.start_time,
+                        '65aa1a7e4109d': row.level,
+                        '65aa1a442705f': row.content
+                      }
+                      let url =
+                        `${process.env.VUE_APP_OA_URL}/admin/flow/create/34?diaoling_oatoken=${this.oaToken}&out_diaoling_id=${row.id}&default_json=${JSON.stringify(jsonInfo)}`
+                      window.open(url, 'diaoling',
+                        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+                      )
+                    }
+                  }
+                },
+                "发起流程"
+              )],
+              ['distribute',h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  on: {
+                    'click': () => this.setTransferStatus(2,row)
+                  }
+                },
+                "下发"
+              )],
+              ['cancel',h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                    ghost: true,
+                  },
+                  on: {
+                    'click': () => this.setTransferStatus(0,row)
+                  }
+                },
+                "取消"
+              )]
+            ])
+            const auths = ['distribute','cancel','oa','edit','delete'].filter(item => {
+              if (row.status === 0) {
+                if (item === 'oa') {
+                  return false
+                }
+              }
+              if ([2,3,4,5,6,7].find(i => i === row.status)) {
+                if (item === 'delete' || item === 'oa') {
+                  return false
+                }
+              }
+              if ([3,4,5,6,7].find(i => i === row.status)) {
+                if (item === 'edit') {
+                  return false
+                }
+              }
+              if (row.liuchengzhuangtai === 2 || row.liuchengzhuangtai === 3) {
+                if (item === 'delete' || item === 'edit') {
+                  return false
+                }
+              }
+              if (!(row.status === 1 || row.status === 0)) {
+                if (item === 'distribute') {
+                  return false
+                }
+              }
+              if (row.status !== 2) {
+                if (item === 'cancel') {
+                  return false
+                }
+              }
+              return true
+            })
+            return h('div',{
+              style: {
+                'display': 'flex'
+              }
+            },[
+              h(
+                "Button",
+                {
+                  style: {
+                    'margin-left': '6px'
                   },
-                  "删除"
-                ),
-              ]
-            );
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  on: {
+                    'click': () => {
+                       this.$refs['callback'].setId(row.id);
+                       this.$refs['callback'].setType('add');
+                       this.$refs['callback'].show();
+                    }
+                  }
+                },
+                "反馈"
+              ),
+              ...auths.map(i => (btnMap.get(i)))
+            ]);
           },
         },
-      ]
+      ],
+
+      form: [],
+      customForm: {
+        customFormId: "",
+        tableName: "",
+      },
     }
   },
   methods: {
+    index,
+    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);
+        }
+      }
+      if (this.$route.meta.params?.select) {
+        try {
+          this.selectQuery = JSON.parse(
+            decodeURIComponent(this.$route.meta.params?.select)
+          );
+        } 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格式错误");
+      }
+      fieldRes?.forEach((i, index) => {
+        i._relations = relation.find((j) => j.custom_form_field === i.field);
+        if (i.select_item && typeof i.select_item === "object") {
+          let keys = Object.keys(i.select_item);
+          if (keys.length > 0) {
+            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));
+          } 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 = fields;
+    },
+
+    setTransferStatus (status,row) {
+      let copyRow = deepCopy(row);
+      copyRow.status = status;
+      for (let key in copyRow) {
+        if (/_relation/g.test(key)) {
+          delete copyRow[key]
+        }
+      }
+      save({
+        table_name: 'transfers',
+        ...copyRow
+      }).then(_ => this.getDispatches())
+    },
+
+    cloneTemplate () {
+      this.$refs['listTable']?.getSelection()?.forEach((i) => {
+        delete i["equipment_id-span"];
+        delete i["_index"];
+        delete i["_rowKey"];
+      });
+      this.$prompt("请输入模板名称", "模板", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputValidator: (value) => {
+          return !!value;
+        },
+        inputErrorMessage: "请输入模板名称",
+      }).then(({ value }) => {
+        save({
+          table_name: "transfer_templates",
+          name: value,
+          content: JSON.stringify(
+            this.$refs['listTable']?.getSelection()?.map((i) => ({
+              equipment_id: i.equipment_id,
+              start_time: this.$moment(i.start_time).format("HH:mm"),
+              end_time: this.$moment(i.end_time).format("HH:mm"),
+              content: i.content,
+              level: i.level,
+            }))
+          ),
+        }).then((_) => {
+          this.$message({
+            type: "success",
+            message: "保存成功",
+          });
+        });
+      });
+    },
+
+    async distributeTransfers () {
+      let promiseAll = this.$refs['listTable'].getSelection().map(i => {
+        for (let key in i) {
+          if (/_relation/g.test(key)) {
+            delete i[key]
+          }
+        }
+        i.status = 2;
+        return save({
+          table_name: 'transfers',
+          ...i
+        })
+      })
+      const res = await Promise.all(promiseAll)
+      this.$message({
+        type: 'success',
+        message: `下发${res.length}条调令`
+      })
+      await this.getDispatches();
+    },
+
+    pickNoDistribute () {
+      this.data = this.data.map(i => {
+        i._checked = i.status === 1
+        return i
+      })
+    },
+
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       const span = column["key"] + "-span";
       if (row[span]) {
@@ -244,6 +592,7 @@ export default {
   watch: {
   },
   created() {
+    this.getFormDetail()
     this.getDispatches()
     this.$bus.$on('pickDate',e => (this.date = e,this.getDispatches()))
     this.$bus.$on('yinpaishui',e => (this.abilities = e))
diff --git a/src/views/order/component/normalCreate.vue b/src/views/order/component/normalCreate.vue
index 2e1bb07..940dea9 100644
--- a/src/views/order/component/normalCreate.vue
+++ b/src/views/order/component/normalCreate.vue
@@ -31,13 +31,18 @@
     </div>
 
     <div class="point panel">
-      <div class="title">创建调令</div>
-
-      <div class="point-container">
-        <Card class="point-container__card">
-          <createDispatch></createDispatch>
-        </Card>
+      <div style="display: flex;justify-content: space-between;align-items: center;">
+        <div class="title">创建调令</div>
+        <el-button size="mini" type="primary" @click="isShowCreate = !isShowCreate">{{ isShowCreate ? '收起' : '展开'}}<i class="el-icon-arrow-down el-icon--right"></i></el-button>
       </div>
+
+      <transition name="create">
+        <div class="point-container" v-show="isShowCreate">
+          <Card class="point-container__card">
+            <createDispatch ref="createDispatch" @createdTransfer="isShowCreate = false"></createDispatch>
+          </Card>
+        </div>
+      </transition>
     </div>
 
     <div class="dispatch panel">
@@ -45,7 +50,7 @@
 
       <div class="point-container">
         <Card class="point-container__card">
-          <dispatchList></dispatchList>
+          <dispatchList @cloneTransfers="cloneTransfers"></dispatchList>
         </Card>
       </div>
     </div>
@@ -53,6 +58,7 @@
 </template>
 
 <script>
+import { weather, info } from "@/api/other";
 import { index, save } from "@/api/system/baseForm";
 import { uuid } from "@/utils";
 
@@ -71,6 +77,7 @@ export default {
   },
   data() {
     return {
+      isShowCreate: true,
       currentStep: 0,
 
       data: [],
@@ -138,13 +145,37 @@ export default {
     }
   },
   methods: {
+    cloneTransfers (transfers) {
+      this.$refs['createDispatch'].handleClone(transfers);
+    },
+
     async getWeatherInfo () {
-      const res = await axios.get('https://restapi.amap.com/v3/weather/weatherInfo?city=320500&key=15ecd1e7de61e684959f43d8965a89f0')
-      console.log(res)
+      let infoObj = {
+        weather: '',
+        water: '',
+        rain: '',
+        prevent: '',
+        early_warning: ''
+      }
+      const weatherInfo = await weather()
+      infoObj.weather = `${weatherInfo.weather},${weatherInfo.wD}${weatherInfo.wS},${weatherInfo.sendibleTemp}-${weatherInfo.temp}°C`
+      const infos = (await info({
+        date: this.$moment().format('YYYY-MM-DD')
+      }))[0]
+      infoObj.water = `${infos?.daily_water?.map(i => i.range + i.stnm + i.s_value + 'm,')?.toString()}`
+      infoObj.rain = `${infos?.daily_rain?.map(i => i.type + i.rain_value + 'mm,')?.toString()}`
+
+      this.weather = infoObj
+
+      await save({
+        table_name: 'waters',
+        date: this.$moment().format('YYYY-MM-DD'),
+        ...infoObj
+      },false)
     },
 
     async getWeather () {
-      this.weather = (await index({
+      const res = (await index({
         table_name: 'waters',
         filter: [
           {
@@ -154,6 +185,12 @@ export default {
           }
         ]
       },false)).data[0]
+
+      if (!res) {
+        await this.getWeatherInfo()
+      } else {
+        this.weather = res
+      }
     }
   },
   computed: {
@@ -171,7 +208,6 @@ export default {
     }
   },
   created() {
-    this.getWeatherInfo()
     this.getWeather()
   }
 }
@@ -258,4 +294,14 @@ export default {
     padding: 20px 0;
   }
 }
+
+.create {
+  transition: all 1s;
+}
+.create-enter-active {
+  opacity: 1;
+}
+.create-leave-active {
+  opacity: 0;
+}
 </style>
diff --git a/src/views/order/create.vue b/src/views/order/create.vue
index 5e1b3c7..4b20429 100644
--- a/src/views/order/create.vue
+++ b/src/views/order/create.vue
@@ -6,6 +6,8 @@
     <template v-else>
       <normalCreate></normalCreate>
     </template>
+
+    <el-backtop target=".app-wrapper"></el-backtop>
   </div>
 </template>
 
diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue
index 1f36b54..d4a4453 100644
--- a/src/views/order/handle.vue
+++ b/src/views/order/handle.vue
@@ -334,7 +334,7 @@
       </template>
       <template #distribute="{ row }">
         <Button
-          v-if="row.status === 1 || row.status === 7"
+          v-if="row.status === 1 || row.status === 0"
           size="small"
           type="primary"
           @click="setTransferStatus(2,row)"
@@ -347,7 +347,7 @@
           size="small"
           type="primary"
           ghost
-          @click="setTransferStatus(7,row)"
+          @click="setTransferStatus(0,row)"
         >取消</Button
         >
       </template>
@@ -476,17 +476,17 @@ export default {
   },
   methods: {
     btnCondition ({ row }, item, index) {
-      if (row.status === 7) {
+      if (row.status === 0) {
         if (item === 'oa') {
           return false
         }
       }
-      if ([2,3,4,5,6].find(i => i === row.status)) {
+      if ([2,3,4,5,6,7].find(i => i === row.status)) {
         if (item === 'delete' || item === 'oa') {
           return false
         }
       }
-      if ([3,4,5,6].find(i => i === row.status)) {
+      if ([3,4,5,6,7].find(i => i === row.status)) {
         if (item === 'edit') {
           return false
         }
diff --git a/src/views/order/history.vue b/src/views/order/history.vue
new file mode 100644
index 0000000..d8ae0c6
--- /dev/null
+++ b/src/views/order/history.vue
@@ -0,0 +1,957 @@
+<template>
+  <div>
+    <!-- 查询配置 -->
+    <div>
+      <div ref="lxHeader">
+        <LxHeader
+          icon="md-apps"
+          :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;">
+                  <el-date-picker
+                    size="small"
+                    type="daterange"
+                    :clearable="false"
+                    v-model="select.filter[2].value"
+                    value-format="yyyy-MM-dd"
+                    placeholder="日期选择"
+                    format="yyyy-MM-dd"
+                    style="width: 240px;"
+                  ></el-date-picker>
+                  <Select clearable v-model="select.filter[1].value" placeholder="请选择类别" style="width: 140px;margin-left: 6px;">
+                    <Option v-for="item in abilities" :value="item.value">{{ item.key }}</Option>
+                  </Select>
+                  <Select clearable v-model="selectArea" placeholder="请选择范围" style="width: 140px;margin-left: 6px;">
+                    <Option v-for="item in areas" :value="item.value">{{ item.key }}</Option>
+                  </Select>
+                  <Input style="width: 140px;margin-left: 6px;" clearable v-model="select.filter[0].value" placeholder="搜索内容"/>
+                  <!--                  <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>-->
+                  <el-popover
+                    placement="bottom-start"
+                    width="200"
+                    trigger="click">
+
+                    <el-tree :data="equipments"
+                             ref="elTree"
+                             :props="{ children: 'children', label: 'name' }"
+                             show-checkbox
+                             @check-change="handleCheckChange">
+                    </el-tree>
+
+                    <Input :value="treeValue" slot="reference" style="width: 140px;margin-left: 6px;" readonly placeholder="搜索点位"></Input>
+                  </el-popover>
+                  <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>
+    <!--$refs['drawer'].setId(row.id);
+              $refs['drawer'].show();-->
+    <xy-table
+      :span-method="objectSpanMethod"
+      :format-list-data="mergeData"
+      :btn-width="300"
+      :auths="auths_auth_mixin"
+      :delay-req="true"
+      :destroy-action="destroy"
+      ref="xyTable"
+      :border="true"
+      :action="index"
+      :req-opt="tableSelect"
+      :destroy-req-opt="select"
+      :table-item="table"
+      @detail="
+        (row) => {
+          $router.push({
+            path: $route.path + '/detail/' + row.id,
+          });
+        }
+      "
+      @editor="
+        (row) => {
+          $refs['dialog'].setId(row.id);
+          $refs['dialog'].setType('editor');
+          $refs['dialog'].show();
+        }
+      "
+    >
+    </xy-table>
+
+  </div>
+</template>
+
+<script>
+import { getOaToken } from "@/api/other";
+import { index as fieldIndex } from "@/api/system/customFormField";
+import { authMixin } from "@/mixin/authMixin";
+import { index, destroy, save } 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 { show as formFieldShow } from "@/api/system/customFormField"
+import * as XLSX from "xlsx";
+import { saveAs } from "file-saver";
+import { listdept } from "@/api/system/department";
+
+import dialoger from "@/views/component/dialog.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 "@/views/component/imports.vue";
+import callback from "@/views/order/component/callback.vue";
+import {deepCopy} from "@/utils";
+import {mergeTableRow} from "@/utils/mergeTableRow";
+export default {
+  components: {
+    LxHeader,
+    dialoger,
+    headerContent,
+    drawer,
+    imports,
+    callback,
+  },
+  mixins: [authMixin],
+  provide: {
+    formStore: () => this.form,
+  },
+  data() {
+    return {
+      areas: [],
+      abilities: [],
+      window: {
+        width: 0,
+        height: 0,
+        top: 0,
+        left: 0
+      },
+      oaToken: "",
+      op,
+      selectArea: "",
+      select: {
+        table_name: "",
+        filter: [
+          {
+            key: "content",
+            op: "like",
+            value: ""
+          },
+          {
+            key: "leibie",
+            op: "eq",
+            value: ""
+          },
+          {
+            key: "start_time",
+            op: "range",
+            value: ""
+          },
+          {
+            key: "equipment_id",
+            op: "in",
+            value: []
+          }
+        ],
+        sort_name: 'start_time',
+      },
+      selectQuery: [],
+      form: [],
+      table: [],
+      customForm: {
+        customFormId: "",
+        tableName: "",
+      },
+
+
+      resetTable: new Map([
+        ["start_time",{
+          formatter: (data, cell, val)=>{
+            return val ? this.$moment(val).format("YYYY-MM-DD HH:mm") : ''
+          }
+        }],
+        ["end_time",{
+          formatter: (data, cell, val)=>{
+            return val ? this.$moment(val).format("HH:mm") : ''
+          }
+        }],
+        ["shichang",{
+          formatter: (data) => {
+            return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours") + "时"
+          }
+        }]
+      ]),
+      equipments: [],
+      treeValue: ""
+    };
+  },
+  methods: {
+    handleCheckChange (data, checked, indeterminate) {
+      this.treeValue = this.$refs['elTree'].getCheckedNodes(true)?.filter(i => !i.children)?.map(i => i.name).toString()
+      this.select.filter[3].value = this.$refs['elTree'].getCheckedNodes(true)?.filter(i => !i.children)?.map(i => i.id)
+    },
+
+    async getEquipments () {
+      const res = (await index({
+        table_name: 'equipments',
+        page: 1,
+        page_size: 9999
+      },false))?.data || []
+      this.equipments = this.areas.map(i => ({
+        name: i.key,
+        children: res.filter(j => j.area === i.value)
+      }))
+      console.log(this.equipments)
+    },
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      const span = column["property"] + "-span";
+      if (row[span]) {
+        return row[span];
+      }
+    },
+
+    mergeData(list) {
+      return mergeTableRow({
+        data: this.selectArea ? list.filter(i => (i.equipment_id_equipments_id_relation?.area === this.selectArea)) : list,
+        mergeColNames: ["equipment_id_equipments_id_relation.area","equipment_id_equipments_id_relation.name"], // 需要合并的列，默认合并列相同的数据
+        firstMergeColNames: ["equipment_id_equipments_id_relation.area","equipment_id_equipments_id_relation.name"], // 受影响的列，只合并以firstMerge为首的同类型数据
+        firstMerge: "equipment_id", // 以哪列为基础进行合并，一般为第一列
+      });
+    },
+
+    pickNoDistribute () {
+      this.$refs['xyTable'].getListData()?.forEach(item => {
+        console.log(item)
+        if (item.status === 1) {
+          this.$refs['xyTable'].toggleRowSelection(item)
+        }
+      })
+    },
+
+    async getArea() {
+      const obj = (await formFieldShow({ id: 4 }, false))?.select_item;
+      if (obj && typeof obj === "object") {
+        let keys = Object.keys(obj);
+        if (keys.length > 0) {
+          this.areas = keys.map((key) => {
+            return {
+              key,
+              value: /^\d*$/.test(obj[key]) ? Number(obj[key]) : obj[key],
+            };
+          });
+        }
+      }
+      await this.getEquipments();
+    },
+    async getAbility() {
+      const obj = (await formFieldShow({ id: 31 }, false))?.select_item;
+      if (obj && typeof obj === "object") {
+        let keys = Object.keys(obj);
+        if (keys.length > 0) {
+          this.abilities = keys.map((key) => {
+            return {
+              key,
+              value: /^\d*$/.test(obj[key]) ? Number(obj[key]) : obj[key],
+            };
+          });
+        }
+      }
+    },
+
+    async toOa (row) {
+      if (!this.oaToken) {
+        this.oaToken = (await getOaToken()).oatoken
+      }
+      let jsonInfo = {
+        'title': row.equipment_id_equipments_id_relation?.name,
+        '65aa1a59e408c': row.start_time,
+        '65aa1a7e4109d': row.level,
+        '65aa1a442705f': row.content
+      }
+      let url =
+        `${process.env.VUE_APP_OA_URL}/admin/flow/create/34?diaoling_oatoken=${this.oaToken}&out_diaoling_id=${row.id}&default_json=${JSON.stringify(jsonInfo)}`
+      window.open(url, 'diaoling',
+        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+      )
+    },
+
+    async distributeTransfers () {
+      let promiseAll = this.$refs['xyTable'].getSelection().map(i => {
+        for (let key in i) {
+          if (/_relation/g.test(key)) {
+            delete i[key]
+          }
+        }
+        i.status = 2;
+        return save({
+          table_name: 'transfers',
+          ...i
+        })
+      })
+      const res = await Promise.all(promiseAll)
+      this.$message({
+        type: 'success',
+        message: `下发${res.length}条调令`
+      })
+      this.$refs['xyTable'].getTableData()
+    },
+
+    cloneTransfer () {
+      this.$router.push({
+        name: 'menu_14',
+        params: {
+          cloneTransfer: this.$refs['xyTable'].getSelection().map(i => ({
+            equipment_id: i.equipment_id,
+            start_time: this.$moment(i.start_time).format('HH:mm'),
+            end_time: this.$moment(i.end_time).format('HH:mm'),
+            content: i.content,
+            level: i.level,
+          }))
+        }
+      })
+    },
+
+    setTransferStatus (status,row) {
+      let copyRow = deepCopy(row);
+      copyRow.status = status;
+      for (let key in copyRow) {
+        if (/_relation/g.test(key)) {
+          delete copyRow[key]
+        }
+      }
+      save({
+        table_name: 'transfers',
+        ...copyRow
+      }).then(_ => this.$refs['xyTable'].getTableData())
+    },
+
+    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.filter(i => i.list_show).map((i) => {
+          return {
+            key: i.field,
+            title: i.name,
+          };
+        });
+        const data = res.data.map((row) =>
+          headers.map((header) => {
+            const i = this.form.find(i => i.field === header.key)
+            //if (i.edit_input === 'file' || i.edit_input === 'files') return ''
+            if (
+              i.select_item &&
+              typeof i.select_item === "object" &&
+              !(i.select_item instanceof Array)
+            ) {
+              let keys = Object.keys(i.select_item);
+              let paramMap = new Map();
+              keys.forEach((key) => {
+                paramMap.set(i.select_item[key], key);
+              });
+              return paramMap.get(row[i.field]?.toString());
+            }
+            if (i._relations) {
+              let { link_relation, foreign_key, link_with_name } = i._relations;
+              if (link_relation === "newHasOne" || link_relation === "hasOne") {
+                return row[link_with_name]?.original_name || row[link_with_name]?.name ||
+                    row[link_with_name]?.no ||
+                    row[link_with_name]?.value
+              }
+
+              if (link_relation === "hasMany" || link_relation === "newHasMany") {
+                return row[link_with_name]?.map((o) => (
+                  o?.name ||
+                  o?.no ||
+                  o?.value ||
+                  o?.biaoti ||
+                  o?.mingcheng
+                )).toString()
+              }
+            }
+
+            return 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);
+        }
+      }
+      if (this.$route.meta.params?.select) {
+        try {
+          this.selectQuery = JSON.parse(
+            decodeURIComponent(this.$route.meta.params?.select)
+          );
+        } 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格式错误");
+      }
+      fieldRes?.forEach((i, index) => {
+        i._relations = relation.find((j) => j.custom_form_field === i.field);
+        if (i.select_item && typeof i.select_item === "object") {
+          let keys = Object.keys(i.select_item);
+          if (keys.length > 0) {
+            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));
+          } 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 = fields;
+      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 = [];
+          if (this.resetTable.get(i.field)) {
+            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.resetTable.get(i.field)
+            ))
+            return
+          }
+          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({
+        width: 100,
+        label: "范围",
+        prop: "equipment_id_equipments_id_relation.area",
+        formatter:(data,row,val) => {
+          return this.areas.find(i => i.value === val)?.key
+        }
+      });
+      this.table.unshift({
+        type: "index",
+        width: 60,
+        label: "序号",
+        prop: "index"
+      });
+    },
+  },
+
+  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
+          : [];
+      };
+    },
+
+    tableSelect() {
+      let filter = [...this.select.filter, ...this.selectQuery];
+      return {
+        ...this.select,
+        filter,
+      };
+    },
+  },
+  created() {
+    this.window.width = screen.availWidth * 0.95
+    this.window.height = screen.availHeight * 0.95
+    this.window.top = (window.screen.height - 30 - this.window.height) / 2
+    this.window.left = (window.screen.width - 10 - this.window.width) / 2
+
+    this.getFormDetail();
+    this.getArea();
+    this.getAbility();
+  },
+};
+</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/order/orderPlan.vue b/src/views/order/orderPlan.vue
index 1ca7dbc..e280476 100644
--- a/src/views/order/orderPlan.vue
+++ b/src/views/order/orderPlan.vue
@@ -134,7 +134,7 @@
             {
               key: "status",
               op: "eq",
-              value: 6
+              value: 7
             },
             {
               key: "act_start_time",
diff --git a/src/views/order/orderSummary.vue b/src/views/order/orderSummary.vue
index 35ded07..c73d45b 100644
--- a/src/views/order/orderSummary.vue
+++ b/src/views/order/orderSummary.vue
@@ -155,7 +155,7 @@ export default {
           {
             key: 'status',
             op: 'eq',
-            value: 6
+            value: 7
           }
         ]
       })).data