From ddfd2280cdfee7b7486e0a6d18a2fc1c6b12a2df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=93=E8=B1=86=E8=B1=86?= <3346088772@qq.comcd>
Date: Tue, 9 Jan 2024 09:57:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?AGV=E7=BA=BF=E8=B7=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/dv/route.js                       |  46 ++
 src/api/mes/dv/siteConfiguration.js           |  46 ++
 .../abnormalityAlarm/AGValarm/abnormalAGV.vue |   1 +
 .../AGValarm/historicalAGV.vue                |   1 +
 .../abnormalityAlarm/liku/abnormalLiku.vue    | 520 +++++++++++++++
 .../abnormalityAlarm/liku/historicalLiku.vue  | 367 +++++++++++
 src/views/abnormalityAlarm/liku/index.vue     |  41 ++
 .../machineTool/abnormalAlarm.vue             |   5 +-
 .../machineTool/historicalAnomalyAlarm.vue    |   1 +
 .../robotic/historicalAlarm.vue               |   1 +
 .../abnormalityAlarm/robotic/roboticAlarm.vue |   1 +
 src/views/deviceConsole/machine/index.vue     |   2 +-
 src/views/deviceConsole/robotic/index.vue     | 288 ++++++--
 src/views/mes/dv/route/index.vue              | 541 +++++++++++++++
 src/views/mes/dv/siteConfiguration/index.vue  | 540 +++++++++++++++
 src/views/mes/md/pallet/index.vue             | 618 ++++++++++++++++++
 16 files changed, 2946 insertions(+), 73 deletions(-)
 create mode 100644 src/api/mes/dv/route.js
 create mode 100644 src/api/mes/dv/siteConfiguration.js
 create mode 100644 src/views/abnormalityAlarm/liku/abnormalLiku.vue
 create mode 100644 src/views/abnormalityAlarm/liku/historicalLiku.vue
 create mode 100644 src/views/abnormalityAlarm/liku/index.vue
 create mode 100644 src/views/mes/dv/route/index.vue
 create mode 100644 src/views/mes/dv/siteConfiguration/index.vue
 create mode 100644 src/views/mes/md/pallet/index.vue

diff --git a/src/api/mes/dv/route.js b/src/api/mes/dv/route.js
new file mode 100644
index 0000000..40cd9fb
--- /dev/null
+++ b/src/api/mes/dv/route.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询agv线路
+export function findProAgvline(query) {
+  return request({
+    url: '/proagv/findProAgvline',
+    method: 'get',
+    params: query
+  })
+}
+
+// 自动生成agv线路编码
+export function findLineCode(query) {
+    return request({
+      url: '/proagv/findLineCode',
+      method: 'get',
+      params: query
+    })
+  }
+
+// 新增agv线路
+export function addProAgvline(data) {
+  return request({
+    url: '/proagv/addProAgvline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改agv线路
+export function updateProAgvline(data) {
+    return request({
+      url: '/proagv/updateProAgvline',
+      method: 'post',
+      data: data
+    })
+  }
+
+  // 删除agv线路
+export function deleteProAgvline(data) {
+    return request({
+      url: '/proagv/deleteProAgvline',
+      method: 'post',
+      data: data
+    })
+  }
\ No newline at end of file
diff --git a/src/api/mes/dv/siteConfiguration.js b/src/api/mes/dv/siteConfiguration.js
new file mode 100644
index 0000000..14b772e
--- /dev/null
+++ b/src/api/mes/dv/siteConfiguration.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询agv站点
+export function findProAgvsite(query) {
+  return request({
+    url: '/proagvsite/findProAgvsite',
+    method: 'get',
+    params: query
+  })
+}
+
+// 自动生成agv站点编码
+export function findSiteCode(query) {
+    return request({
+      url: '/proagvsite/findSiteCode',
+      method: 'get',
+      params: query
+    })
+  }
+
+// 新增agv站点
+export function addProAgvsite(data) {
+  return request({
+    url: '/proagvsite/addProAgvsite',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改agv线路
+export function updateProAgvsite(data) {
+    return request({
+      url: '/proagvsite/updateProAgvsite',
+      method: 'post',
+      data: data
+    })
+  }
+
+  // 删除agv站点
+export function deleteProAgvsite(data) {
+    return request({
+      url: '/proagvsite/deleteProAgvsite',
+      method: 'post',
+      data: data
+    })
+  }
\ No newline at end of file
diff --git a/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue b/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue
index 8dc8b98..96b25e2 100644
--- a/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue
+++ b/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue
@@ -336,6 +336,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        machineryTypeId: 229,
       },
       // 表单参数
       form: {
diff --git a/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue b/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue
index d7c650f..4155d2b 100644
--- a/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue
+++ b/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue
@@ -242,6 +242,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        machineryTypeId: 229,
       },
       // 表单参数
       form: {
diff --git a/src/views/abnormalityAlarm/liku/abnormalLiku.vue b/src/views/abnormalityAlarm/liku/abnormalLiku.vue
new file mode 100644
index 0000000..fb2eb5a
--- /dev/null
+++ b/src/views/abnormalityAlarm/liku/abnormalLiku.vue
@@ -0,0 +1,520 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="异常报警类型" label-width="100px" prop="warnType">
+        <el-select
+          v-model="queryParams.warnType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="处理状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in statusArr"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >处理</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >置顶</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="abnormal" label="设备是否异常:">
+              <el-radio-group v-model="form.abnormal">
+                <el-radio :label="1">异常</el-radio>
+                <el-radio :label="2">无异常</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <el-form-item prop="status" label="是否解决:">
+              <el-radio-group v-model="form.status">
+                <el-radio :label="1">已解决</el-radio>
+                <el-radio :label="2">未解决</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 置顶 -->
+    <el-dialog
+      title="置顶"
+      :visible.sync="openTop"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="top" label="设备是否异常:">
+              <el-radio-group v-model="form.top">
+                <el-radio :label="0">不置顶</el-radio>
+                <el-radio :label="1">置顶</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleForm">确 定</el-button>
+        <el-button @click="openopenTop">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: 230,
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+      //置顶弹框
+      openTop: false,
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+        top: [{ required: true, message: "是否置顶不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        console.log(response);
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+
+    // 取消按钮
+    openopenTop() {
+      this.openTop = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      console.log(selection);
+      this.ids = selection.map((item) => item.codeId);
+      console.log(this.ids);
+
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      console.log(row);
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 处理 */
+    handleUpdate(row) {
+      console.log(row);
+      this.reset();
+      this.open = true;
+      this.title = "处理";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      console.log(row);
+      this.reset();
+      this.openTop = true;
+    },
+
+    /** 置顶提交按钮 */
+    handleForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/liku/historicalLiku.vue b/src/views/abnormalityAlarm/liku/historicalLiku.vue
new file mode 100644
index 0000000..b4cedc6
--- /dev/null
+++ b/src/views/abnormalityAlarm/liku/historicalLiku.vue
@@ -0,0 +1,367 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="异常报警类型" label-width="100px" prop="subjectType">
+        <el-select
+          v-model="queryParams.subjectType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: 230,
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        console.log(response);
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      console.log(selection);
+      this.ids = selection.map((item) => item.codeId);
+      console.log(this.ids);
+
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      console.log(row);
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      console.log(row);
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/liku/index.vue b/src/views/abnormalityAlarm/liku/index.vue
new file mode 100644
index 0000000..0167dd9
--- /dev/null
+++ b/src/views/abnormalityAlarm/liku/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="app-container">
+    <!-- 切换 -->
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="异常报警" name="1">
+        <abnormalLiku />
+      </el-tab-pane>
+      <el-tab-pane label="历史异常报警" name="2">
+        <historicalLiku />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import abnormalLiku from "./abnormalLiku.vue";
+import historicalLiku from "./historicalLiku.vue";
+
+export default {
+  components: { abnormalLiku, historicalLiku },
+  data() {
+    return {
+      //默认tab切换为1
+      activeName: "1",
+    };
+  },
+  methods: {
+    //点击tab切换
+    handleClick() {
+      this.activeName = "2";
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  line-height: 40px;
+  display: flex;
+}
+</style>
diff --git a/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue b/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue
index 8dc8b98..f820a45 100644
--- a/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue
+++ b/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue
@@ -17,9 +17,9 @@
         />
       </el-form-item>
 
-      <el-form-item label="异常报警类型" label-width="100px" prop="subjectType">
+      <el-form-item label="异常报警类型" label-width="100px" prop="warnType">
         <el-select
-          v-model="queryParams.subjectType"
+          v-model="queryParams.warnType"
           placeholder="请选择"
           clearable
           style="width: 150px"
@@ -336,6 +336,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        machineryTypeId: 227,
       },
       // 表单参数
       form: {
diff --git a/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue
index d7c650f..30a4ade 100644
--- a/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue
+++ b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue
@@ -242,6 +242,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        machineryTypeId: 227,
       },
       // 表单参数
       form: {
diff --git a/src/views/abnormalityAlarm/robotic/historicalAlarm.vue b/src/views/abnormalityAlarm/robotic/historicalAlarm.vue
index d7c650f..7260dd6 100644
--- a/src/views/abnormalityAlarm/robotic/historicalAlarm.vue
+++ b/src/views/abnormalityAlarm/robotic/historicalAlarm.vue
@@ -242,6 +242,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        machineryTypeId: 228,
       },
       // 表单参数
       form: {
diff --git a/src/views/abnormalityAlarm/robotic/roboticAlarm.vue b/src/views/abnormalityAlarm/robotic/roboticAlarm.vue
index 8dc8b98..3793fac 100644
--- a/src/views/abnormalityAlarm/robotic/roboticAlarm.vue
+++ b/src/views/abnormalityAlarm/robotic/roboticAlarm.vue
@@ -336,6 +336,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        machineryTypeId: 228,
       },
       // 表单参数
       form: {
diff --git a/src/views/deviceConsole/machine/index.vue b/src/views/deviceConsole/machine/index.vue
index 63f12b3..5d32312 100644
--- a/src/views/deviceConsole/machine/index.vue
+++ b/src/views/deviceConsole/machine/index.vue
@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <el-col :span="5"
         ><div class="grid-content bg-purple">
-          <div class="grid-content three" style="height: 750px">
+          <div class="grid-content three" style="height: 750px;border-radius: 10px">
             <!-- 选择设备 -->
             <el-container style="padding: 0">
               <el-header
diff --git a/src/views/deviceConsole/robotic/index.vue b/src/views/deviceConsole/robotic/index.vue
index b896efa..e661555 100644
--- a/src/views/deviceConsole/robotic/index.vue
+++ b/src/views/deviceConsole/robotic/index.vue
@@ -1,9 +1,12 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="5"
+      <el-col :span="4"
         ><div class="grid-content bg-purple">
-          <div class="grid-content three" style="height: 750px">
+          <div
+            class="grid-content three"
+            style="height: 750px; border-radius: 10px"
+          >
             <!-- 选择设备 -->
             <el-container style="padding: 0">
               <el-header
@@ -40,7 +43,30 @@
               border-radius: 30px;
               margin-left: 32%;
             "
-          ></div>
+          >
+            <p
+              v-if="Powersupply"
+              style="
+                font-size: 20px;
+                color: rgb(158, 158, 158);
+                margin: 19px;
+                text-align: center;
+              "
+            >
+              Power down
+            </p>
+            <p
+              v-else
+              style="
+                font-size: 20px;
+                color: rgb(158, 158, 158);
+                margin: 19px;
+                text-align: center;
+              "
+            >
+              Power on
+            </p>
+          </div>
           <div
             style="
               border: 1px solid rgb(217, 216, 216);
@@ -52,12 +78,22 @@
               background: rgba(204, 204, 221, 0.2);
             "
           >
-            <div style="margin-top: 9%">
+            <p
+              style="
+                font-size: 14px;
+                color: rgb(158, 158, 158);
+                margin: 0px;
+                text-align: center;
+              "
+            >
+              Control
+            </p>
+            <div style="margin-top: 2%">
               <el-row type="flex" class="row-bg" justify="center">
                 <el-col :span="4"
                   ><div class="grid-content bg-purple">
                     <div v-if="elimage">
-                      <el-button @click="elbutton"
+                      <el-button @click="upbutton"
                         ><el-image
                           :src="sd"
                           style="width: 20px; height: 20px"
@@ -75,7 +111,7 @@
                       </p>
                     </div>
                     <div v-else>
-                      <el-button @click="buttonto">
+                      <el-button @click="downbutton">
                         <el-image
                           :src="xd"
                           style="width: 20px; height: 20px"
@@ -124,7 +160,123 @@
           </div>
         </div></el-col
       >
-      <el-col :span="4"><div class="grid-content bg-purple">2</div></el-col>
+      <el-col :span="5"
+        ><div class="grid-content bg-purple">
+          <div
+            class="grid-content three"
+            style="width: 330px; height: 335px; border-radius: 10px"
+          >
+            <el-header
+              class="smallHeader"
+              style="height: 40px; line-height: 40px"
+              >Robot Operation Panel
+            </el-header>
+            <div style="margin: 6px">
+              <el-radio-group
+                v-model="radio4"
+                size="mini"
+                style="display: flex"
+              >
+                <el-radio-button :label="1">j1轴</el-radio-button>
+                <el-radio-button :label="2">j2轴</el-radio-button>
+                <el-radio-button :label="3">j3轴</el-radio-button>
+                <el-radio-button :label="4">j4轴</el-radio-button>
+                <el-radio-button :label="5">j5轴</el-radio-button>
+                <el-radio-button :label="6">j6轴</el-radio-button>
+              </el-radio-group>
+            </div>
+            <div
+              style="
+                width: 90%;
+                height: 120px;
+                margin: auto;
+                border-radius: 10px;
+                box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+              "
+            >
+              <el-header
+                class="smallHeader"
+                style="height: 30px; line-height: 30px"
+                >Coordinate
+              </el-header>
+              <div style="margin: 20px 10px">
+                <el-row type="flex" class="row-bg" justify="space-around">
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple"
+                      style="text-align: center"
+                    >
+                      X:{{ 123 }}
+                    </div></el-col
+                  >
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple-light"
+                      style="text-align: center"
+                    >
+                      Y:{{ 123 }}
+                    </div></el-col
+                  >
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple"
+                      style="text-align: center"
+                    >
+                      Z:{{ 123 }}
+                    </div></el-col
+                  >
+                </el-row>
+              </div>
+              <div style="margin: 20px 10px">
+                <el-row type="flex" class="row-bg" justify="space-around">
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple"
+                      style="text-align: center"
+                    >
+                      A:{{ 123 }}
+                    </div></el-col
+                  >
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple-light"
+                      style="text-align: center"
+                    >
+                      B:{{ 123 }}
+                    </div></el-col
+                  >
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple"
+                      style="text-align: center"
+                    >
+                      C:{{ 123 }}
+                    </div></el-col
+                  >
+                </el-row>
+              </div>
+            </div>
+            <div
+              style="
+                width: 90%;
+                height: 88px;
+                margin: auto;
+                margin-top: 20px;
+                border-radius: 10px;
+                box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+              "
+            >
+              <el-header
+                class="smallHeader"
+                style="height: 30px; line-height: 30px"
+              >
+                Standard
+              </el-header>
+              <div style="margin: 20px 20px">Speed limit:{{ 1 }}</div>
+            </div>
+          </div>
+        </div></el-col
+      >
     </el-row>
   </div>
 </template>
@@ -150,6 +302,8 @@ export default {
         machineryTypeId: "",
       },
       elimage: true,
+      Powersupply: true,
+      radio4: "1",
       img: require("../../../assets/images/robotic.png"),
       sd: require("../../../assets/images/shangdian.png"),
       xd: require("../../../assets/images/weishangdian.png"),
@@ -175,13 +329,6 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // axios
-      //   .get("http://192.168.3.53:8077/manage/device/devices")
-      //   .then((res) => {
-      //     this.intelligent = res.data.data;
-      //     this.loading = false;
-      //   });
-
       listMachinerytype().then((response) => {
         var data = "";
         response.data.forEach((item) => {
@@ -201,7 +348,6 @@ export default {
             this.intelligent.push(item);
           }
         });
-        console.log(this.intelligent);
         this.loading = false;
       });
     },
@@ -212,65 +358,67 @@ export default {
     },
 
     setInterval() {
-      //   axios
-      //     .get("http://192.168.3.53:8077/manage/modbus/data", {
-      //       params: {
-      //         id: this.id,
-      //       },
-      //     })
-      //     .then((res) => {
-      //       console.log(res.data.data);
-      //       this.intelligentData = res.data.data;
-      //     });
+      // axios
+      //   .get("http://192.168.3.53:8077/manage/modbus/data", {
+      //     params: {
+      //       id: this.id,
+      //     },
+      //   })
+      //   .then((res) => {
+      //     this.intelligentData = res.data.data;
+      //   });
     },
 
-    elbutton() {
-      this.elimage = false;
+    upbutton() {
+      if (this.id != "") {
+        axios
+          .get("http://192.168.3.53:8077/manage/robot/powerOn", {
+            params: {
+              id: this.id,
+            },
+          })
+          .then((res) => {
+            console.log(res);
+            if (res.data.code === 200) {
+              this.elimage = false;
+              this.Powersupply = false;
+              this.$modal.msgSuccess("上电成功");
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+      } else {
+        this.$message({
+          message: "请选择设备",
+          type: "warning",
+        });
+      }
     },
 
-    buttonto() {
-      this.elimage = true;
-    },
-
-    off() {
-      //   if (this.id != "") {
-      //     axios
-      //       .get("http://192.168.3.53:8077/manage/modbus/operate", {
-      //         params: {
-      //           id: this.id,
-      //           type: 2,
-      //         },
-      //       })
-      //       .then((res) => {
-      //         this.imgdata = true;
-      //         this.$modal.msgSuccess("停止成功");
-      //       });
-      //   } else {
-      //     this.$message({
-      //       message: "请选择设备",
-      //       type: "warning",
-      //     });
-      //   }
-    },
-    on() {
-      //   if (this.id != "") {
-      //     axios
-      //       .get("http://192.168.3.53:8077/manage/modbus/operate", {
-      //         params: {
-      //           id: this.id,
-      //           type: 1,
-      //         },
-      //       })
-      //       .then((res) => {
-      //         this.imgdata = false;
-      //         this.$modal.msgSuccess("启动成功");
-      //       });
-      //   } else {
-      //     this.$message({
-      //       message: "请选择设备",
-      //       type: "warning",
-      //     });
-      //   }
+    downbutton() {
+      if (this.id != "") {
+        axios
+          .get("http://192.168.3.53:8077/manage/robot/powerOff", {
+            params: {
+              id: this.id,
+            },
+          })
+          .then((res) => {
+            console.log(res);
+            if (res.data.code === 200) {
+              this.elimage = true;
+              this.Powersupply = true;
+              this.$modal.msgSuccess("下电成功");
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+      } else {
+        this.$message({
+          message: "请选择设备",
+          type: "warning",
+        });
+      }
     },
   },
 };
diff --git a/src/views/mes/dv/route/index.vue b/src/views/mes/dv/route/index.vue
new file mode 100644
index 0000000..6273f97
--- /dev/null
+++ b/src/views/mes/dv/route/index.vue
@@ -0,0 +1,541 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="线路名称" prop="lineName">
+        <el-input
+          v-model="queryParams.lineName"
+          placeholder="请输入线路名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select
+          v-model="queryParams.enableFlag"
+          placeholder="请选择是否启用"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in whetherEnabled"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['mes:dv:dvsubject:add']"
+            >新增线路</el-button
+          >
+        </el-col>
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col> -->
+      </el-col>
+
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="AGV线路编码"
+        width="120"
+        align="center"
+        key="lineCode"
+        prop="lineCode"
+        v-if="1"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:dv:route']"
+            >{{ scope.row.lineCode }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="AGV线路名称" align="center" prop="lineName" />
+      <el-table-column label="所属车间" align="center" prop="workshopName" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.enableFlag == 'Y'"
+            >是</span
+          >
+          <span
+            class="el-table-column-span-1"
+            v-if="scope.row.enableFlag == 'N'"
+            >否</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="AGV线路编码" prop="lineCode">
+              <el-input
+                v-model="form.lineCode"
+                placeholder="请输入AGV线路编码"
+                maxlength="64"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label-width="120px"
+              label="AGV线路名称"
+              prop="lineName"
+            >
+              <el-input
+                v-model="form.lineName"
+                placeholder="请输入AGV线路名称"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属车间" prop="workshopName">
+              <el-select
+                v-model="form.workshopName"
+                placeholder="请选择车间"
+                style="width: 100%"
+                value-key="workshopId"
+                @change="handleAccompanyId"
+              >
+                <el-option
+                  v-for="item in workshopOptions"
+                  :key="item.workshopId"
+                  :label="item.workshopName"
+                  :value="item"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enableFlag">
+              <el-radio-group v-model="form.enableFlag">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.remark"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  findProAgvline,
+  findLineCode,
+  addProAgvline,
+  updateProAgvline,
+  deleteProAgvline,
+} from "@/api/mes/dv/route";
+import { listAllWorkshop } from "@/api/mes/md/workshop";
+import { genCode } from "@/api/system/autocode/rule";
+export default {
+  name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_dvsubject_type"],
+  data() {
+    return {
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      id: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        lineName: null,
+        enableFlag: null,
+      },
+      //车间选项
+      workshopOptions: [],
+      // 表单参数
+      form: {
+        proAgvlineId: "",
+        lineCode: "",
+        lineName: "",
+        workshopId: "",
+        enableFlag: "Y",
+        remark: "",
+      },
+      whetherEnabled: [
+        {
+          value: "Y",
+          label: "是",
+        },
+        {
+          value: "N",
+          label: "否",
+        },
+      ],
+      // 表单校验
+      rules: {
+        lineCode: [
+          { required: true, message: "AGV线路编码不能为空", trigger: "blur" },
+        ],
+        workshopName: [
+          { required: true, message: "所属车间不能为空", trigger: "blur" },
+        ],
+        lineName: [
+          { required: true, message: "AGV线路名称不能为空", trigger: "blur" },
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 列表 */
+    getList() {
+      this.loading = true;
+      findProAgvline(this.queryParams).then((response) => {
+        console.log(response);
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getWorkshops() {
+      listAllWorkshop().then((response) => {
+        this.workshopOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        proAgvlineId: "",
+        lineCode: "",
+        lineName: "",
+        workshopId: "",
+        enableFlag: "Y",
+        remark: "",
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.id = selection.map((item) => item.proAgvlineId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getWorkshops();
+      this.open = true;
+      this.title = "新增AGV线路";
+      findLineCode().then((response) => {
+        console.log(response);
+        this.form.lineCode = response.data.lineCode;
+      });
+    },
+    //选择车间
+    handleAccompanyId(val) {
+      this.form.workshopCode = val.workshopCode;
+      this.form.workshopName = val.workshopName;
+      this.form.workshopId = val.workshopId;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      console.log(row);
+      this.reset();
+      this.getWorkshops();
+      this.form = row;
+      this.form.subjectId = row.proAgvlineId;
+      this.open = true;
+      this.title = "修改代码";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.subjectId != null) {
+            updateProAgvline(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "修改成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addProAgvline(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "新增成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      //   console.log(row);
+      //   const subjectIds = row.proAgvlineId || this.id;
+      //   this.$modal
+      //     .confirm("是否确认删除当前的数据项？")
+      //     .then(function () {
+      //       return deleteProAgvline(subjectIds);
+      //     })
+      //     .then(() => {
+      //       this.getList();
+      //       this.$modal.msgSuccess("删除成功");
+      //     })
+      //     .catch(() => {});
+
+      deleteProAgvline({ proAgvlineId: row.proAgvlineId }).then((response) => {
+        this.$modal
+          .confirm("是否确认删除当前的数据项？")
+          .then(() => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "删除成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.getList();
+            }
+          })
+          .catch(() => {});
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      //   this.download(
+      //     "dv/dvsubject/export",
+      //     {
+      //       ...this.queryParams,
+      //     },
+      //     `dvsubject_${new Date().getTime()}.xlsx`
+      //   );
+    },
+    //自动生成物料编码
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        findLineCode().then((response) => {
+          this.form.lineCode = response.data.lineCode;
+        });
+      } else {
+        this.form.lineCode = null;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+
+.el-table-column-span {
+  background-color: #e8f4ff;
+  border-color: #d1e9ff;
+  color: #1890ff;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+.el-table-column-span-1 {
+  background-color: #ffeded;
+  border-color: #ffdbdb;
+  color: #ff4949;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/mes/dv/siteConfiguration/index.vue b/src/views/mes/dv/siteConfiguration/index.vue
new file mode 100644
index 0000000..8d329c7
--- /dev/null
+++ b/src/views/mes/dv/siteConfiguration/index.vue
@@ -0,0 +1,540 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="线路名称" prop="siteName">
+        <el-input
+          v-model="queryParams.siteName"
+          placeholder="请输入线路名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select
+          v-model="queryParams.enableFlag"
+          placeholder="请选择是否启用"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in whetherEnabled"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['mes:dv:dvsubject:add']"
+            >新增站点</el-button
+          >
+        </el-col>
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col> -->
+      </el-col>
+
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="AGV站点编码"
+        width="120"
+        align="center"
+        key="siteCode"
+        prop="siteCode"
+        v-if="1"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:dv:route']"
+            >{{ scope.row.siteCode }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="AGV站点名称" align="center" prop="siteName" />
+      <el-table-column label="所属线路" align="center" prop="workshopName" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.enableFlag == 'Y'"
+            >是</span
+          >
+          <span
+            class="el-table-column-span-1"
+            v-if="scope.row.enableFlag == 'N'"
+            >否</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="AGV站点编码" prop="siteCode">
+              <el-input
+                v-model="form.siteCode"
+                placeholder="请输入AGV站点编码"
+                maxlength="64"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label-width="120px"
+              label="AGV站点名称"
+              prop="siteName"
+            >
+              <el-input
+                v-model="form.siteName"
+                placeholder="请输入AGV站点名称"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属线路" prop="lineName">
+              <el-select
+                v-model="form.lineName"
+                placeholder="请选择所属线路"
+                style="width: 100%"
+                value-key="proAgvlineId"
+                @change="handleAccompanyId"
+              >
+                <el-option
+                  v-for="item in workshopOptions"
+                  :key="item.proAgvlineId"
+                  :label="item.lineName"
+                  :value="item"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enableFlag">
+              <el-radio-group v-model="form.enableFlag">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="PLC IP地址" prop="plcIpAddress">
+              <el-input
+                v-model="form.plcIpAddress"
+                placeholder="请输PLC IP地址"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.remark"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { findProAgvline } from "@/api/mes/dv/route";
+import {
+  findProAgvsite,
+  findSiteCode,
+  addProAgvsite,
+  updateProAgvsite,
+  deleteProAgvsite,
+} from "@/api/mes/dv/siteConfiguration";
+import { genCode } from "@/api/system/autocode/rule";
+export default {
+  name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_dvsubject_type"],
+  data() {
+    return {
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      id: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        siteName: null,
+        enableFlag: null,
+      },
+      //车间选项
+      workshopOptions: [],
+      // 表单参数
+      form: {
+        proAgvlineId: "",
+        siteCode: "",
+        siteName: "",
+        agvlineId: "",
+        lineName: "",
+        enableFlag: "Y",
+        remark: "",
+      },
+      whetherEnabled: [
+        {
+          value: "Y",
+          label: "是",
+        },
+        {
+          value: "N",
+          label: "否",
+        },
+      ],
+      // 表单校验
+      rules: {
+        siteCode: [
+          { required: true, message: "AGV站点编码不能为空", trigger: "blur" },
+        ],
+        lineName: [
+          { required: true, message: "所属线路不能为空", trigger: "blur" },
+        ],
+        siteName: [
+          { required: true, message: "AGV站点名称不能为空", trigger: "blur" },
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 列表 */
+    getList() {
+      //   this.loading = true;
+      findProAgvsite(this.queryParams).then((response) => {
+        console.log(response);
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getWorkshops() {
+      findProAgvline(this.queryParams).then((response) => {
+        this.workshopOptions = response.rows;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        proAgvlineId: "",
+        siteCode: "",
+        siteName: "",
+        agvlineId: "",
+        enableFlag: "Y",
+        remark: "",
+        lineName: "",
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.id = selection.map((item) => item.proAgvlineId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getWorkshops();
+      this.open = true;
+      this.title = "新增AGV线路";
+      findSiteCode().then((response) => {
+        console.log(response);
+        this.form.siteCode = response.data.siteCode;
+      });
+    },
+    //选择线路
+    handleAccompanyId(val) {
+      console.log(val);
+      this.form.lineName = val.lineName;
+      this.form.agvlineId = val.proAgvlineId;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      console.log(row);
+      this.reset();
+      this.getWorkshops();
+      this.form = row;
+      this.form.subjectId = row.proAgvlineId;
+      this.open = true;
+      this.title = "修改代码";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.subjectId != null) {
+            updateProAgvsite(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "修改成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addProAgvsite(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "新增成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      deleteProAgvsite({ proAgvlineId: row.proAgvlineId }).then((response) => {
+        this.$modal
+          .confirm("是否确认删除当前的数据项？")
+          .then(() => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "删除成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.getList();
+            }
+          })
+          .catch(() => {});
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      //   this.download(
+      //     "dv/dvsubject/export",
+      //     {
+      //       ...this.queryParams,
+      //     },
+      //     `dvsubject_${new Date().getTime()}.xlsx`
+      //   );
+    },
+    //自动生成物料编码
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        findSiteCode().then((response) => {
+          this.form.siteCode = response.data.siteCode;
+        });
+      } else {
+        this.form.siteCode = null;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+
+.el-table-column-span {
+  background-color: #e8f4ff;
+  border-color: #d1e9ff;
+  color: #1890ff;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+.el-table-column-span-1 {
+  background-color: #ffeded;
+  border-color: #ffdbdb;
+  color: #ff4949;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/mes/md/pallet/index.vue b/src/views/mes/md/pallet/index.vue
new file mode 100644
index 0000000..03c7a6a
--- /dev/null
+++ b/src/views/mes/md/pallet/index.vue
@@ -0,0 +1,618 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--数据-->
+      <el-col>
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="托盘编码" prop="itemCode">
+            <el-input
+              v-model="queryParams.itemCode"
+              placeholder="请输入托盘编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['mes:md:mditem:add']"
+              >新增</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['mes:md:mditem:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['mes:md:mditem:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['mes:md:mditem:import']"
+              >导入</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['mes:md:mditem:export']"
+              >导出</el-button
+            >
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="itemList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column
+            label="托盘码"
+            width="120"
+            align="center"
+            key="itemCode"
+            prop="itemCode"
+            v-if="columns[0].visible"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleView(scope.row)"
+                v-hasPermi="['mes:md:mditem:query']"
+                >{{ scope.row.itemCode }}</el-button
+              >
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="托盘尺寸"
+            align="center"
+            key="specification"
+            prop="specification"
+            v-if="columns[2].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="动裁承重"
+            align="center"
+            key="specification"
+            prop="specification"
+            v-if="columns[2].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="静载承重"
+            align="center"
+            key="unitOfMeasure"
+            prop="unitOfMeasure"
+            v-if="columns[3].visible"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            label="当前位置"
+            align="center"
+            key="unitOfMeasure"
+            prop="unitOfMeasure"
+            v-if="columns[3].visible"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['mes:md:mditem:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['mes:md:mditem:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改物料产品编码对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="托盘编码" prop="itemCode">
+              <el-input
+                v-model="form.itemCode"
+                readonly="readonly"
+                maxlength="64"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.itemCode"
+                placeholder="请输入托盘编码"
+                maxlength="64"
+                v-else
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view'"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="托盘尺寸" prop="itemName">
+              <el-input
+                v-model="form.itemName"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.itemName"
+                placeholder="请输入托盘尺寸"
+                maxlength="255"
+                v-else
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="动载承里" prop="">
+              <el-input
+                v-model="form.itemName"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.itemName"
+                placeholder="请输入动载承里"
+                maxlength="255"
+                v-else
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="静载承里" prop="">
+              <el-input
+                v-model="form.itemName"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.itemName"
+                placeholder="请输入静载承里"
+                maxlength="255"
+                v-else
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
+        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button @click="cancel">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 物料导入对话框 -->
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" />
+            是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listMdItem,
+  getMdItem,
+  delMdItem,
+  addMdItem,
+  updateMdItem,
+} from "@/api/mes/md/mdItem";
+
+import { genCode } from "@/api/system/autocode/rule";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "MdItem",
+  dicts: ["sys_yes_no", "mes_item_product"],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料产品表格数据
+      itemList: null,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      //弹框的操作类型 view add edit
+      optType: undefined,
+      //自动生成物料编码标识
+      autoGenFlag: false,
+      // 日期范围
+      dateRange: [],
+      //单位列表
+      measureOptions: [],
+      // 表单参数
+      form: {},
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/mes/md/mditem/importData",
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        itemCode: undefined,
+        itemName: undefined,
+        itemTypeId: 0,
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `物料/产品编码`, visible: true },
+        { key: 1, label: `物料/产品名称`, visible: true },
+        { key: 2, label: `规格型号`, visible: true },
+        { key: 3, label: `单位`, visible: true },
+        { key: 4, label: `物料/产品`, visible: true },
+        { key: 5, label: `物料分类`, visible: true },
+        { key: 6, label: `是否启用`, visible: true },
+        { key: 7, label: `是否设置安全库存`, visible: true },
+        { key: 8, label: `创建时间`, visible: true },
+      ],
+      // 表单校验
+      rules: {
+        itemCode: [
+          { required: true, message: "托盘编码不能为空", trigger: "blur" },
+          {
+            max: 64,
+            message: "物料/产品编码长度必须小于64个字符",
+            trigger: "blur",
+          },
+        ],
+        itemName: [
+          { required: true, message: "物托盘尺寸不能为空", trigger: "blur" },
+        ],
+        unitOfMeasure: [
+          { required: true, message: "单位不能为空", trigger: "blur" },
+        ],
+        itemTypeId: [
+          { required: true, message: "物料分类不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询物料编码列表 */
+    getList() {
+      this.loading = true;
+      listMdItem(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        itemId: undefined,
+        itemTypeId: undefined,
+        itemCode: undefined,
+        itemName: undefined,
+        specification: undefined,
+        unitOfMeasrue: undefined,
+        enableFlag: undefined,
+        itemOrProduct: undefined,
+        enableFlag: "Y",
+        safeStockFlag: "N",
+        minStock: 0,
+        maxStock: 0,
+        optType: undefined,
+        remark: undefined,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.itemId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 查询明细按钮操作
+    handleView(row) {
+      this.reset();
+      const itemId = row.itemId || this.ids;
+      getMdItem(itemId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看物料/产品";
+        this.optType = "view";
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.optType = "add";
+      this.open = true;
+      this.title = "新增托盘";
+      genCode("ITEM_CODE").then((response) => {
+        this.form.itemCode = response;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const itemId = row.itemId || this.ids;
+      getMdItem(itemId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.optType = "edit";
+        this.title = "修改物料/产品";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.itemId != undefined) {
+            updateMdItem(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            debugger;
+            addMdItem(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const itemIds = row.itemId || this.ids;
+      this.$modal
+        .confirm("确认删除数据项？")
+        .then(function () {
+          return delMdItem(itemIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "mes/md/mditem/export",
+        {
+          ...this.queryParams,
+        },
+        `user_${new Date().getTime()}.xlsx`
+      );
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "物料/产品导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download(
+        "mes/md/mditem/importTemplate",
+        {},
+        `md_item_${new Date().getTime()}.xlsx`
+      );
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    //自动生成物料编码
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("ITEM_CODE").then((response) => {
+          this.form.itemCode = response;
+        });
+      } else {
+        this.form.itemCode = null;
+      }
+    },
+  },
+};
+</script>

From 8edef770ce2c664ceeb2988804b7efaed7a3f841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=93=E8=B1=86=E8=B1=86?= <3346088772@qq.comcd>
Date: Tue, 9 Jan 2024 17:59:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?AGV=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dv/route/index.vue             |  67 +-
 src/views/mes/dv/siteConfiguration/index.vue |  52 +-
 src/views/mes/pro/proroute/routeprocess.vue  | 619 ++++++++++++++-----
 3 files changed, 505 insertions(+), 233 deletions(-)

diff --git a/src/views/mes/dv/route/index.vue b/src/views/mes/dv/route/index.vue
index 6273f97..77cb9f4 100644
--- a/src/views/mes/dv/route/index.vue
+++ b/src/views/mes/dv/route/index.vue
@@ -111,20 +111,8 @@
         label="AGV线路编码"
         width="120"
         align="center"
-        key="lineCode"
         prop="lineCode"
-        v-if="1"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleView(scope.row)"
-            v-hasPermi="['mes:dv:route']"
-            >{{ scope.row.lineCode }}</el-button
-          >
-        </template>
-      </el-table-column>
+      />
       <el-table-column label="AGV线路名称" align="center" prop="lineName" />
       <el-table-column label="所属车间" align="center" prop="workshopName" />
       <el-table-column label="是否启用" align="center" prop="enableFlag">
@@ -213,19 +201,18 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="所属车间" prop="workshopName">
+            <el-form-item label="所属车间" prop="workshopId">
               <el-select
-                v-model="form.workshopName"
+                v-model="form.workshopId"
                 placeholder="请选择车间"
                 style="width: 100%"
                 value-key="workshopId"
-                @change="handleAccompanyId"
               >
                 <el-option
                   v-for="item in workshopOptions"
                   :key="item.workshopId"
                   :label="item.workshopName"
-                  :value="item"
+                  :value="item.workshopId"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -300,14 +287,7 @@ export default {
       //车间选项
       workshopOptions: [],
       // 表单参数
-      form: {
-        proAgvlineId: "",
-        lineCode: "",
-        lineName: "",
-        workshopId: "",
-        enableFlag: "Y",
-        remark: "",
-      },
+      form: {},
       whetherEnabled: [
         {
           value: "Y",
@@ -323,7 +303,7 @@ export default {
         lineCode: [
           { required: true, message: "AGV线路编码不能为空", trigger: "blur" },
         ],
-        workshopName: [
+        workshopId: [
           { required: true, message: "所属车间不能为空", trigger: "blur" },
         ],
         lineName: [
@@ -356,18 +336,20 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
       this.reset();
+      this.getList();
+      this.open = false;
     },
     // 表单重置
     reset() {
       this.form = {
-        proAgvlineId: "",
-        lineCode: "",
-        lineName: "",
-        workshopId: "",
+        subjectId: null,
+        proAgvlineId: null,
+        lineCode: null,
+        lineName: null,
+        workshopId: null,
         enableFlag: "Y",
-        remark: "",
+        remark: null,
       };
       this.autoGenFlag = true;
       this.resetForm("form");
@@ -399,12 +381,6 @@ export default {
         this.form.lineCode = response.data.lineCode;
       });
     },
-    //选择车间
-    handleAccompanyId(val) {
-      this.form.workshopCode = val.workshopCode;
-      this.form.workshopName = val.workshopName;
-      this.form.workshopId = val.workshopId;
-    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       console.log(row);
@@ -413,7 +389,7 @@ export default {
       this.form = row;
       this.form.subjectId = row.proAgvlineId;
       this.open = true;
-      this.title = "修改代码";
+      this.title = "修改AGV线路";
     },
     /** 提交按钮 */
     submitForm() {
@@ -449,19 +425,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      //   console.log(row);
-      //   const subjectIds = row.proAgvlineId || this.id;
-      //   this.$modal
-      //     .confirm("是否确认删除当前的数据项？")
-      //     .then(function () {
-      //       return deleteProAgvline(subjectIds);
-      //     })
-      //     .then(() => {
-      //       this.getList();
-      //       this.$modal.msgSuccess("删除成功");
-      //     })
-      //     .catch(() => {});
-
       deleteProAgvline({ proAgvlineId: row.proAgvlineId }).then((response) => {
         this.$modal
           .confirm("是否确认删除当前的数据项？")
diff --git a/src/views/mes/dv/siteConfiguration/index.vue b/src/views/mes/dv/siteConfiguration/index.vue
index 8d329c7..1d62d4c 100644
--- a/src/views/mes/dv/siteConfiguration/index.vue
+++ b/src/views/mes/dv/siteConfiguration/index.vue
@@ -126,7 +126,7 @@
         </template>
       </el-table-column>
       <el-table-column label="AGV站点名称" align="center" prop="siteName" />
-      <el-table-column label="所属线路" align="center" prop="workshopName" />
+      <el-table-column label="所属线路" align="center" prop="agvlineName" />
       <el-table-column label="是否启用" align="center" prop="enableFlag">
         <template slot-scope="scope">
           <span class="el-table-column-span" v-if="scope.row.enableFlag == 'Y'"
@@ -151,7 +151,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:dv:dvsubject:edit']"
             >修改</el-button
           >
           <el-button
@@ -159,7 +158,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:dv:dvsubject:remove']"
             >删除</el-button
           >
         </template>
@@ -213,19 +211,18 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="所属线路" prop="lineName">
+            <el-form-item label="所属线路" prop="agvlineId">
               <el-select
-                v-model="form.lineName"
+                v-model="form.agvlineId"
                 placeholder="请选择所属线路"
                 style="width: 100%"
                 value-key="proAgvlineId"
-                @change="handleAccompanyId"
               >
                 <el-option
                   v-for="item in workshopOptions"
                   :key="item.proAgvlineId"
                   :label="item.lineName"
-                  :value="item"
+                  :value="item.proAgvlineId"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -294,7 +291,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 设备点检保养项目表格数据
+      // 列表
       dvsubjectList: [],
       // 弹出层标题
       title: "",
@@ -311,11 +308,11 @@ export default {
       workshopOptions: [],
       // 表单参数
       form: {
-        proAgvlineId: "",
+        proAgvsiteId: "",
         siteCode: "",
         siteName: "",
         agvlineId: "",
-        lineName: "",
+        agvlineName: "",
         enableFlag: "Y",
         remark: "",
       },
@@ -334,7 +331,7 @@ export default {
         siteCode: [
           { required: true, message: "AGV站点编码不能为空", trigger: "blur" },
         ],
-        lineName: [
+        agvlineId: [
           { required: true, message: "所属线路不能为空", trigger: "blur" },
         ],
         siteName: [
@@ -367,19 +364,21 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
       this.reset();
+      this.getList();
+      this.open = false;
     },
     // 表单重置
     reset() {
       this.form = {
-        proAgvlineId: "",
-        siteCode: "",
-        siteName: "",
-        agvlineId: "",
+        subjectId: null,
+        proAgvsiteId: null,
+        siteCode: null,
+        siteName: null,
+        agvlineId: null,
         enableFlag: "Y",
-        remark: "",
-        lineName: "",
+        remark: null,
+        agvlineName: null,
       };
       this.autoGenFlag = true;
       this.resetForm("form");
@@ -396,7 +395,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.id = selection.map((item) => item.proAgvlineId);
+      this.id = selection.map((item) => item.proAgvsiteId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -405,27 +404,21 @@ export default {
       this.reset();
       this.getWorkshops();
       this.open = true;
-      this.title = "新增AGV线路";
+      this.title = "新增AGV站点";
       findSiteCode().then((response) => {
         console.log(response);
         this.form.siteCode = response.data.siteCode;
       });
     },
-    //选择线路
-    handleAccompanyId(val) {
-      console.log(val);
-      this.form.lineName = val.lineName;
-      this.form.agvlineId = val.proAgvlineId;
-    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       console.log(row);
       this.reset();
       this.getWorkshops();
       this.form = row;
-      this.form.subjectId = row.proAgvlineId;
+      this.form.subjectId = row.proAgvsiteId;
       this.open = true;
-      this.title = "修改代码";
+      this.title = "修改AGV站点";
     },
     /** 提交按钮 */
     submitForm() {
@@ -461,7 +454,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      deleteProAgvsite({ proAgvlineId: row.proAgvlineId }).then((response) => {
+      console.log(row);
+      deleteProAgvsite({ proAgvsiteId: row.proAgvsiteId }).then((response) => {
         this.$modal
           .confirm("是否确认删除当前的数据项？")
           .then(() => {
diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue
index e74c185..b8ddf89 100644
--- a/src/views/mes/pro/proroute/routeprocess.vue
+++ b/src/views/mes/pro/proroute/routeprocess.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" v-if="optType !='view'" class="mb8">
+    <el-row :gutter="10" v-if="optType != 'view'" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -9,7 +9,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:pro:proroute:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -20,7 +21,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:pro:proroute:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -31,40 +33,99 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:pro:proroute:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="routeprocessList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="routeprocessList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" fixed prop="orderNum" />
-      <el-table-column label="工序编码" width="120px" fixed align="center" prop="processCode" />
-      <el-table-column label="工序名称" width="150px" fixed align="center" prop="processName" />
-      <el-table-column label="下一道工序" width="150px"  align="center" prop="nextProcessName" />
-      <el-table-column label="与下一道工序关系" width="150px" align="center" prop="linkType">
+      <el-table-column
+        label="工序编码"
+        width="120px"
+        fixed
+        align="center"
+        prop="processCode"
+      />
+      <el-table-column
+        label="工序名称"
+        width="150px"
+        fixed
+        align="center"
+        prop="processName"
+      />
+      <el-table-column
+        label="下一道工序"
+        width="150px"
+        align="center"
+        prop="nextProcessName"
+      />
+      <el-table-column
+        label="与下一道工序关系"
+        width="150px"
+        align="center"
+        prop="linkType"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_link_type" :value="scope.row.linkType"/>
+          <dict-tag
+            :options="dict.type.mes_link_type"
+            :value="scope.row.linkType"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="关键工序" width="100px" align="center" prop="keyFlag">
+      <el-table-column
+        label="关键工序"
+        width="100px"
+        align="center"
+        prop="keyFlag"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.keyFlag"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.keyFlag"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="质检确认" width="100px" align="center" prop="isCheck">
+      <el-table-column
+        label="质检确认"
+        width="100px"
+        align="center"
+        prop="isCheck"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isCheck"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.isCheck"
+          />
         </template>
       </el-table-column>
       <el-table-column label="准备时间" align="center" prop="defaultPreTime" />
       <el-table-column label="等待时间" align="center" prop="defaultSufTime" />
-      <el-table-column label="甘特图显示颜色" align="center" prop="colorCode" >
+      <el-table-column label="甘特图显示颜色" align="center" prop="colorCode">
         <template slot-scope="scope">
-            <el-color-picker v-model="scope.row.colorCode" disabled></el-color-picker>
+          <el-color-picker
+            v-model="scope.row.colorCode"
+            disabled
+          ></el-color-picker>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="150px" v-if="optType !='view'" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        fixed="right"
+        width="150px"
+        v-if="optType != 'view'"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -72,20 +133,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:proroute:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:pro:proroute:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -93,119 +156,231 @@
     />
 
     <!-- 添加或修改工艺组成对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1100px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row>
-            <el-col :span="12">
-                <el-form-item label="序号" prop="orderNum">
-                    <el-input-number :min="1" v-model="form.orderNum" placeholder="请输入序号" />
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-                <el-form-item label="工序" prop="processId">
-                    <el-select v-model="form.processId" placeholder="请选择工序">
-                        <el-option
-                        v-for="item in processOptions"
-                        :key="item.processId"
-                        :label="item.processName"
-                        :value="item.processId"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-col>
+          <el-col :span="12">
+            <el-form-item label="序号" prop="orderNum">
+              <el-input-number
+                :min="1"
+                v-model="form.orderNum"
+                placeholder="请输入序号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工序" prop="processId">
+              <el-select v-model="form.processId" placeholder="请选择工序">
+                <el-option
+                  v-for="item in processOptions"
+                  :key="item.processId"
+                  :label="item.processName"
+                  :value="item.processId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-            <el-col :span="12">
-                <el-form-item label="与下一道工序关系" prop="linkType">
-                    <el-tooltip effect="dark" placement="right">
-                    <div slot="content">
+          <el-col :span="12">
+            <el-form-item label="与下一道工序关系" prop="linkType">
+              <el-tooltip effect="dark" placement="right">
+                <div slot="content">
                         F-to-S：当前工序结束生产，下一道工序才可开始生产 </br>
                         S-to-F：当前工序开始生产，下一道工序才可结束生产 </br>
                         F-to-F：当前工序结束生产，下一道工序才可结束生产 </br>
                         S-to-S：当前工序开始生产，下一道工序才可开始生产 </br>
                     </div>
-                    <el-select v-model="form.linkType" placeholder="请选择与下一道工序关系">
-                        <el-option
-                        v-for="dict in dict.type.mes_link_type"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                        ></el-option>
-                    </el-select>
-                    </el-tooltip>
-                </el-form-item>
-            </el-col>
-            <el-col :span="5">
-                <el-form-item label="甘特图显示颜色" prop="colorCode">
-                    <el-color-picker v-model="form.colorCode"></el-color-picker>                        
-                </el-form-item>
-            </el-col>
-            <el-col :span="7">
-                    <el-input v-model="form.colorCode" maxlength="7" placeholder="请输入颜色编码在左侧选择颜色" />                
-            </el-col>
+                <el-select
+                  v-model="form.linkType"
+                  placeholder="请选择与下一道工序关系"
+                >
+                  <el-option
+                    v-for="dict in dict.type.mes_link_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="甘特图显示颜色" prop="colorCode">
+              <el-color-picker v-model="form.colorCode"></el-color-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-input
+              v-model="form.colorCode"
+              maxlength="7"
+              placeholder="请输入颜色编码在左侧选择颜色"
+            />
+          </el-col>
         </el-row>
         <el-row>
-            <el-col :span="8">
-              <el-form-item label="是否关键工序" prop="keyFlag">
-                    <el-tooltip effect="dark" placement="right">
-                    <div slot="content">
+          <el-col :span="12">
+            <el-form-item label="是否关键工序" prop="keyFlag">
+              <el-tooltip effect="dark" placement="right">
+                <div slot="content">
                         是：整个工单的生产进度将根据当前工序的生产报工数量进行更新</br>
                         每个工艺流程只能有一个关键工序                        
                     </div>
-                    <el-select v-model="form.keyFlag">
-                        <el-option
-                        v-for="dict in dict.type.sys_yes_no"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                        ></el-option>
-                    </el-select>
-                    </el-tooltip>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="是否需要质检确认" prop="isCheck">
-                    <el-tooltip effect="dark" placement="right">
-                    <div slot="content">
+                <el-select v-model="form.keyFlag">
+                  <el-option
+                    v-for="dict in dict.type.sys_yes_no"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否需要质检确认" prop="isCheck">
+              <el-tooltip effect="dark" placement="right">
+                <div slot="content">
                         是：当前工序报工时需要进行质检确认</br>
                         质检合格数量作为最终生产数量                                            
                     </div>
-                    <el-select v-model="form.isCheck">
-                        <el-option
-                        v-for="dict in dict.type.sys_yes_no"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                        ></el-option>
-                    </el-select>
-                    </el-tooltip>
-                </el-form-item>
-            </el-col>
+                <el-select v-model="form.isCheck">
+                  <el-option
+                    v-for="dict in dict.type.sys_yes_no"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-                <el-form-item label="准备时间" prop="defaultPreTime">
-                    <el-tooltip effect="dark" content="当前系统支持的最小时间粒度为1小时" placement="right">
-                        <el-input-number :min="0" :step="1" v-model="form.defaultPreTime" placeholder="请输入准备时间" />
-                    </el-tooltip>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8">
-                <el-form-item label="等待时间" prop="defaultSufTime">
-                    <el-input-number :min="0" :step="1" v-model="form.defaultSufTime" placeholder="请输入等待时间" />
-                </el-form-item>
-            </el-col>
+          <el-col :span="12">
+            <el-form-item label="准备时间" prop="defaultPreTime">
+              <el-tooltip
+                effect="dark"
+                content="当前系统支持的最小时间粒度为1小时"
+                placement="right"
+              >
+                <el-input-number
+                  :min="0"
+                  :step="1"
+                  v-model="form.defaultPreTime"
+                  placeholder="请输入准备时间"
+                />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="等待时间" prop="defaultSufTime">
+              <el-input-number
+                :min="0"
+                :step="1"
+                v-model="form.defaultSufTime"
+                placeholder="请输入等待时间"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-            <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                </el-form-item>
-            </el-col>
+          <el-col :span="12">
+            <el-form-item label="选择设备类型" prop="machineryTypeId">
+              <treeselect
+                v-model="form.machineryTypeId"
+                :options="machineryTypeOptions"
+                :normalizer="normalizer"
+                placeholder="请选择设备类型"
+                :disable-branch-nodes="true"
+                @select="handleNodeClick"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="代码上传" prop="">
+              <el-upload
+                ref="codeName"
+                class="upload-demo"
+                :headers="this.headers"
+                action="/prod-api/common/uploadMinio"
+                :before-remove="beforeRemove"
+                :on-change="customUploadChangeImage2"
+                :before-upload="beforeUpload"
+                :on-exceed="handleExceedImage1"
+                accept=".PDF"
+                name="file"
+                multiple
+                :limit="1"
+                :file-list="fileList"
+              >
+                <el-button size="small" type="primary" icon="el-icon-upload2"
+                  >点击上传</el-button
+                >
+                <el-button type="primary" size="small" @click.stop="previewFile"
+                  >&nbsp;预览文件</el-button
+                >
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="选择线路" prop="lineId">
+              <el-select
+                v-model="form.lineId"
+                placeholder="请选择线路"
+                style="width: 100%"
+                value-key="proAgvlineId"
+              >
+                <el-option
+                  v-for="item in workshopOptions"
+                  :key="item.proAgvlineId"
+                  :label="item.lineName"
+                  :value="item.proAgvlineId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选择点位" prop="lineId">
+              <el-select
+                v-model="form.pointId"
+                placeholder="请选择点位"
+                style="width: 100%"
+                value-key="proAgvsiteId"
+              >
+                <el-option
+                  v-for="item in dvsubjectList"
+                  :key="item.proAgvsiteId"
+                  :label="item.siteName"
+                  :value="item.proAgvsiteId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -214,13 +389,28 @@
 </template>
 
 <script>
-import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/mes/pro/routeprocess";
-import {listAllProcess} from "@/api/mes/pro/process";
+import { findProAgvline } from "@/api/mes/dv/route";
+import { findProAgvsite } from "@/api/mes/dv/siteConfiguration";
+import {
+  listRouteprocess,
+  getRouteprocess,
+  delRouteprocess,
+  addRouteprocess,
+  updateRouteprocess,
+} from "@/api/mes/pro/routeprocess";
+import { listAllProcess } from "@/api/mes/pro/process";
+import { getToken } from "@/utils/auth";
+import { listMachinerytype } from "@/api/mes/dv/machinerytype";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Routeprocess",
-  dicts: ['mes_link_type','sys_yes_no'],
+  dicts: ["mes_link_type", "sys_yes_no"],
+  components: { Treeselect },
   data() {
     return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -236,7 +426,7 @@ export default {
       // 工艺组成表格数据
       routeprocessList: [],
       //工序选项
-      processOptions:[],    
+      processOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -258,57 +448,167 @@ export default {
         defaultSufTime: null,
         colorCode: null,
       },
+      // 设备类型树选项
+      machineryTypeOptions: [],
+      fileList: [],
+      //车间线路
+      workshopOptions: [],
+      // 站点
+      dvsubjectList: [],
+      lineName:"",
+      pointName:"",
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         routeId: [
-          { required: true, message: "工艺路线ID不能为空", trigger: "blur" }
+          { required: true, message: "工艺路线ID不能为空", trigger: "blur" },
         ],
         processId: [
-          { required: true, message: "工序ID不能为空", trigger: "blur" }
+          { required: true, message: "工序ID不能为空", trigger: "blur" },
         ],
         nextProcessId: [
-          { required: true, message: "工序ID不能为空", trigger: "blur" }
+          { required: true, message: "工序ID不能为空", trigger: "blur" },
         ],
         keyFlag: [
-        { required: true, message: "请指定当前工序是否关键工序", trigger: "blur" }
+          {
+            required: true,
+            message: "请指定当前工序是否关键工序",
+            trigger: "blur",
+          },
         ],
         isCheck: [
-        { required: true, message: "请指定当前工序是否需要质检确认", trigger: "blur" }
-        ]
-      }
+          {
+            required: true,
+            message: "请指定当前工序是否需要质检确认",
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
-  props :{
-      routeId: undefined,
-      optType: undefined
+  props: {
+    routeId: undefined,
+    optType: undefined,
   },
   created() {
     this.getList();
     this.getProcess();
+    this.getTreeselect();
+    this.getWorkshops();
   },
   methods: {
     /** 查询工艺组成列表 */
     getList() {
       this.loading = true;
-      listRouteprocess(this.queryParams).then(response => {
+      listRouteprocess(this.queryParams).then((response) => {
         this.routeprocessList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
     //查询工序信息
-    getProcess(){
-      listAllProcess().then( response =>{
+    getProcess() {
+      listAllProcess().then((response) => {
         this.processOptions = response.data;
       });
     },
+    getWorkshops() {
+      findProAgvline().then((response) => {
+        this.workshopOptions = response.rows;
+      });
+      findProAgvsite().then((response) => {
+        this.dvsubjectList = response.rows;
+      });
+    },
+    /** 查询设备类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then((response) => {
+        this.machineryTypeOptions = [];
+        const data = this.handleTree(
+          response.data,
+          "machineryTypeId",
+          "parentTypeId"
+        )[0];
+        this.machineryTypeOptions.push(data);
+      });
+    },
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.machineryTypeId,
+        label: node.machineryTypeName,
+        children: node.children,
+      };
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      console.log(data);
+      this.form.machineryTypeName = data.machineryTypeName;
+    },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
+    beforeUpload(e) {
+      // console.log(e);
+      this.files = e;
+    },
+    customUploadChangeImage2(files) {
+      console.log(files);
+      if (files.status === "ready") return;
+      if (files.status === "success") {
+        const res = files.response || {};
+        if (res && res.code === 200) {
+          this.form.url = files.response.url;
+          this.form.originalName = files.response.originalFileName;
+          this.$message({
+            type: "success",
+            message: "上传成功!",
+          });
+          this.uploadVisible = false;
+        } else {
+          this.$message.error("上传失败!");
+          this.fileList = [];
+        }
+      } else {
+        this.$message.error("上传失败!");
+        this.fileList = [];
+      }
+    },
+
+    // 删除文件
+    beforeRemove(files, fileList) {
+      return this.$confirm(`确定移除 ${files.name}？`);
+    },
+
+    // 上传按钮 限制图文件大小和类型
+    handleChangeUpload(file, fileList) {
+      const isLt2M = file.size / 1024 / 1024 < 10;
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 10MB!");
+        return false;
+      }
+    },
+    handleExceedImage1(file, fileList) {
+      // console.log(file);
+      this.$message.warning(`当前限制上传 1 个文件，以上传 ${file.length} 个`);
+    },
+
+    //预览文件
+    previewFile() {
+      console.log(this.form);
+      if (this.form.url != undefined && this.form.url != "") {
+        var url = this.form.url;
+        window.open(url);
+      } else {
+        this.$message.warning(`请上传文件`);
+      }
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -317,7 +617,7 @@ export default {
         processId: null,
         processCode: null,
         processName: null,
-        isCheck: 'N',
+        isCheck: "N",
         orderNum: 1,
         nextProcessId: null,
         nextProcessCode: null,
@@ -325,7 +625,7 @@ export default {
         linkType: null,
         defaultPreTime: 0,
         defaultSufTime: 0,
-        colorCode: '#00AEF3',
+        colorCode: "#00AEF3",
         remark: null,
         attr1: null,
         attr2: null,
@@ -334,8 +634,9 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
+      this.fileList = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -350,23 +651,29 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.recordId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.recordId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.title = "添加工艺组成";
-      var arr = Object.values(this.routeprocessList).pop()
-      this.form.orderNum = arr.orderNum + 1;
+      listRouteprocess(this.queryParams).then((response) => {
+        this.form.orderNum = response.total + 1;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const recordId = row.recordId || this.ids
-      getRouteprocess(recordId).then(response => {
+      var name = {};
+      if (row.originalName != undefined && row.originalName != "") {
+        this.$set(name, "name", row.originalName);
+        this.fileList.push(name);
+      }
+      const recordId = row.recordId || this.ids;
+      getRouteprocess(recordId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改工艺组成";
@@ -374,16 +681,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.recordId != null) {
-            updateRouteprocess(this.form).then(response => {
+            updateRouteprocess(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addRouteprocess(this.form).then(response => {
+            addRouteprocess(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -395,19 +702,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const recordIds = row.recordId || this.ids;
-      this.$modal.confirm('是否确认删除工艺组成编号为"' + recordIds + '"的数据项？').then(function() {
-        return delRouteprocess(recordIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除工艺组成编号为"' + recordIds + '"的数据项？')
+        .then(function () {
+          return delRouteprocess(recordIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/pro/routeprocess/export', {
-        ...this.queryParams
-      }, `routeprocess_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "mes/pro/routeprocess/export",
+        {
+          ...this.queryParams,
+        },
+        `routeprocess_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>