From a21da56c94f81453eac8126dab5865d9216e01f2 Mon Sep 17 00:00:00 2001
From: SimpleJouer <3143976203@qq.com>
Date: Wed, 16 Aug 2023 13:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/md/MdWorksortController.cs            |  73 +++++
 .../mes/md/IService/IMdWorksortService.cs     |  19 ++
 ZR.Service/mes/md/MdWorksortService.cs        |  49 ++++
 ZR.Vue/src/api/basisManagement/worksort.js    |  39 +++
 .../src/views/basisManagement/procedure.vue   | 267 ++++++++++++++++++
 ZR.Vue/src/views/basisManagement/process.vue  | 267 ++++++++++++++++++
 ZR.Vue/vue.config.js                          |   4 +-
 7 files changed, 716 insertions(+), 2 deletions(-)
 create mode 100644 ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs
 create mode 100644 ZR.Service/mes/md/IService/IMdWorksortService.cs
 create mode 100644 ZR.Service/mes/md/MdWorksortService.cs
 create mode 100644 ZR.Vue/src/api/basisManagement/worksort.js

diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs
new file mode 100644
index 00000000..d3817822
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs
@@ -0,0 +1,73 @@
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.mes.md;
+using ZR.Service.mes.md.IService;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics.CodeAnalysis;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Model.mes.md;
+using ZR.Service.mes.md;
+using ZR.Service.mes.md.IService;
+
+namespace ZR.Admin.WebApi.Controllers.mes.md
+{
+    [Route("mes/md/Worksort")]
+    public class MdWorksortController : BaseController
+    {
+        IMdWorksortService worksortService;
+
+        public MdWorksortController(IMdWorksortService worksortService)
+        {
+            this.worksortService = worksortService;
+        }
+
+        [HttpGet("list")]
+        public IActionResult List(int pageNum, int pageSize, string WorksortCode = "", string WorksortName = "")
+        {
+
+            (int, List<MdWorksort>) data = worksortService.GetAll(WorksortCode, WorksortName, pageNum, pageSize);
+
+            return ToResponse(new ApiResult(200, "success", data));
+
+        }
+        /// <summary>
+        /// 插入车间
+        /// </summary>
+        /// <param name="worksort"></param>
+        /// <returns></returns>
+        [HttpPost("addWorksort")]
+        public IActionResult AddWorksort([FromBody] MdWorksort worksort)
+        {
+            if (worksort != null)
+                worksort.ToCreate(HttpContext);
+            int result = worksortService.AddWorksort(worksort);
+            return SUCCESS(result);
+        }
+
+
+        [HttpPost("updateWorksort")]
+        public IActionResult UpdateWorksort([FromBody] MdWorksort worksort)
+        {
+            if (worksort != null)
+                worksort.ToUpdate(HttpContext);
+            int result = worksortService.UpdateWorksort(worksort);
+            return SUCCESS(result);
+        }
+
+
+        [HttpPost("delWorksort")]
+        public IActionResult deleteWorksort([FromBody] List<int> ids)
+        {
+            if (ids != null)
+            {
+                int result = worksortService.deleteWorksort(ids.ToArray());
+                return ToResponse(result);
+            }
+            return null;
+        }
+
+
+
+
+    }
+}
diff --git a/ZR.Service/mes/md/IService/IMdWorksortService.cs b/ZR.Service/mes/md/IService/IMdWorksortService.cs
new file mode 100644
index 00000000..f29cc42d
--- /dev/null
+++ b/ZR.Service/mes/md/IService/IMdWorksortService.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.mes.md;
+
+namespace ZR.Service.mes.md.IService
+{
+    public interface IMdWorksortService
+    {
+        int AddWorksort(MdWorksort workshop);
+
+        public (int, List<MdWorksort>) GetAll(string WorksortCode, string WorksortName, int pageNum, int pageSize);
+        public int UpdateWorksort(MdWorksort workshop);
+
+        public int deleteWorksort(int[] ids);
+    }
+}
diff --git a/ZR.Service/mes/md/MdWorksortService.cs b/ZR.Service/mes/md/MdWorksortService.cs
new file mode 100644
index 00000000..d1736db1
--- /dev/null
+++ b/ZR.Service/mes/md/MdWorksortService.cs
@@ -0,0 +1,49 @@
+using Infrastructure.Attribute;
+using Microsoft.Extensions.DependencyInjection;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.mes.md;
+using ZR.Service.mes.md.IService;
+
+namespace ZR.Service.mes.md
+{
+    [AppService(ServiceType = typeof(IMdWorksortService), ServiceLifetime = LifeTime.Transient)]
+    public class MdWorksortService : BaseService<MdWorksort>, IMdWorksortService
+    {
+
+        public int AddWorksort(MdWorksort workshop)
+        {
+            return Add(workshop);
+
+
+        }
+
+        public int deleteWorksort(int[] ids)
+        {
+            return Delete(ids);
+        }
+
+        public (int, List<MdWorksort>) GetAll(string worksortCode, string worksortName, int pageNum, int pageSize)
+        {
+            int totalNum = 0;
+            var predicate = Expressionable.Create<MdWorksort>()
+                .AndIF(!string.IsNullOrEmpty(worksortCode), it => it.WorksortCode.Contains(worksortCode))
+                .AndIF(!string.IsNullOrEmpty(worksortName), it => it.WorksortName.Contains(worksortName))
+                .ToExpression();
+
+
+            List<MdWorksort> data = Context.Queryable<MdWorksort>().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
+
+            return (totalNum, data);
+        }
+
+        public int UpdateWorksort(MdWorksort workshop)
+        {
+            return Update(workshop, true);
+        }
+    }
+}
diff --git a/ZR.Vue/src/api/basisManagement/worksort.js b/ZR.Vue/src/api/basisManagement/worksort.js
new file mode 100644
index 00000000..cd041a33
--- /dev/null
+++ b/ZR.Vue/src/api/basisManagement/worksort.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+import { downFile } from '@/utils/request'
+
+export function getWorksortList(query) {
+  return request({
+    url: '/mes/md/Worksort/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function insertWorksort(data) {
+  return request({
+    url: '/mes/md/Worksort/addWorksort',
+    method: 'post',
+    data: data,
+    contextType:"application/json"
+  })
+}
+
+
+export function updateWorksort(data) {
+  return request({
+    url: '/mes/md/Worksort/updateWorksort',
+    method: 'post',
+    data: data,
+    contextType:"application/json"
+  })
+}
+
+
+export function delWorksort(data) {
+  return request({
+    url: '/mes/md/Worksort/delWorksort',
+    method: 'post',
+    data: data,
+    contextType:"application/json"
+  })
+}
diff --git a/ZR.Vue/src/views/basisManagement/procedure.vue b/ZR.Vue/src/views/basisManagement/procedure.vue
index e69de29b..969cc668 100644
--- a/ZR.Vue/src/views/basisManagement/procedure.vue
+++ b/ZR.Vue/src/views/basisManagement/procedure.vue
@@ -0,0 +1,267 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索部分 -->
+    <div>
+      <el-form :model="search" inline v-show="search.showSearch">
+        <el-form-item label="工序编码 ">
+          <el-input v-model="search.worksortCode" placeholder="输入工序编码"></el-input>
+        </el-form-item>
+        <el-form-item label="工序名称 ">
+          <el-input v-model="search.WorksortName" placeholder="输入工序名称"></el-input>
+        </el-form-item>
+        <el-button icon="el-icon-search" circle @click="getList"></el-button>
+      </el-form>
+    </div>
+    <!-- 按钮排 -->
+    <div>
+      <el-row :gutter="2">
+        <el-col :span="1.5">
+          <el-button type="primary" size="small" @click="addItem">增加</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" size="small" @click="updataItem(true)" :disabled="updateDisable">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" size="small" @click="deleteItem(true)" :disabled="delDisable">删除</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="search.showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+      <el-row>
+        <pagination
+          :v-show="true"
+          :total="pagination.total"
+          :page.sync="pagination.pageNum"
+          :limit.sync="pagination.pageSize"
+          @pagination="getList"
+        />
+      </el-row>
+    </div>
+    <div>
+      <vxe-table
+        border
+        ref="xTable1"
+        :data="table.WorksortList"
+        :loading="table.loading"
+        @checkbox-change="selectChangeEvent"
+        :row-config="{ isHover: true }"
+      >
+        <vxe-column type="checkbox" width="60"></vxe-column>
+        <vxe-column field="worksortCode" title="工序编码" sortable></vxe-column>
+        <vxe-column field="worksortName" title="工序名称" sortable></vxe-column>
+        <vxe-column title="查看工位">
+          <template slot-scope="scope">
+            <el-button type="primary" round @click="updataItem(false, scope.row)">选择工位</el-button>
+          </template>
+        </vxe-column>
+        <vxe-column title="操作" show-overflow>
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="updataItem(false, scope.row)">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteItem(false, scope.row)" class="delred">删除</el-button>
+          </template>
+        </vxe-column>
+      </vxe-table>
+    </div>
+
+    <!-- 弹窗-- 修改和删除 -->
+    <el-dialog :title="DMLdialog.title" :visible.sync="DMLdialog.visiable" width="600px" append-to-body>
+      <el-form ref="DMLdialog" :model="DMLdialog.form" label-width="150px" label-position="left" :rules="DMLdialog.rules">
+        <el-form-item label="工序编码 " prop="worksortCode">
+          <el-input v-model="DMLdialog.form.worksortCode" placeholder="输入工序编码"></el-input>
+        </el-form-item>
+        <el-form-item label="工序名称 " prop="WorksortName">
+          <el-input v-model="DMLdialog.form.worksortName" placeholder="输入工序名称"></el-input>
+        </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 { getWorksortList, insertWorksort, updateWorksort, delWorksort } from '@/api/basisManagement/worksort.js'
+export default {
+  name: 'procedure', //工序名称
+  data() {
+    return {
+      //搜索框配置
+      search: {
+        id: '',
+        worksortCode: '',
+        WorksortName: '',
+        showSearch: true,
+      },
+      //表格
+      table: {
+        loading: true,
+        WorksortList: [],
+      },
+      //分页
+      pagination: {
+        total: 0,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      //新增修改数据项配置
+      DMLdialog: {
+        title: '',
+        visiable: false,
+        form: {
+          id: '',
+          worksortCode: '',
+          worksortName: '',
+        },
+        rules: {
+          worksortCode: [{ required: true, message: '工序编码不能为空', trigger: 'blur' }],
+          WorksortName: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
+        },
+      },
+      //修改按钮
+      updateDisable: true,
+      //删除按钮
+      delDisable: true,
+      flag: 'update', //区分修改和删除
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    //获取表格数据
+    getList() {
+      const query = { ...this.search, ...this.pagination }
+      delete query.showSearch
+      getWorksortList(query).then((res) => {
+        if (res.code == 200) {
+          this.table.loading = false
+          this.pagination.total = res.data.item1
+          this.table.WorksortList = res.data.item2
+        }
+      })
+    },
+
+    //行更新
+    handleUpdate(row) {},
+    //行删除
+    handleDelete(row) {},
+    selectChangeEvent({ checked }) {
+      const records = this.$refs.xTable1.getCheckboxRecords()
+      if (records.length == 1) {
+        this.updateDisable = false
+      } else {
+        this.updateDisable = true
+      }
+      if (records.length > 0) {
+        this.delDisable = false
+      } else {
+        this.delDisable = true
+      }
+    },
+    //新增按钮
+    addItem() {
+      this.DMLdialog.title = '新增'
+      this.DMLdialog.visiable = true
+      this.flag = 'add'
+    },
+    //新增确认
+    submitForm() {
+      if (this.flag == 'update') {
+        updateWorksort(this.DMLdialog.form).then((res) => {
+          if (res.code == 200 && res.data == 1) {
+            this.$notify.success('修改成功')
+            this.getList()
+            this.DMLdialog.visiable = false
+            this.reset()
+          }
+        })
+      } else if (this.flag == 'add') {
+        this.$refs['DMLdialog'].validate((valid) => {
+          if (valid) {
+            insertWorksort(this.DMLdialog.form).then((res) => {
+              if (res.code == 200) {
+                this.getList()
+                this.DMLdialog.visiable = false
+                this.reset()
+              }
+            })
+          }
+        })
+      }
+    },
+    cancel() {
+      this.DMLdialog.visiable = false
+      this.reset()
+    },
+    reset() {
+      this.DMLdialog.form = {
+        worksortCode: '',
+        worksortName: '',
+      }
+      this.DMLdialog.form.reset();
+    },
+    //修改事件
+    updataItem(flag, row) {
+      debugger
+      this.DMLdialog.title = '修改'
+      this.DMLdialog.visiable = true
+      this.flag = 'update'
+      if (!flag) {
+        this.DMLdialog.form.worksortCode = row.worksortCode
+        this.DMLdialog.form.worksortName = row.worksortName
+        this.DMLdialog.form.id = row.id
+      } else {
+        const records = this.$refs.xTable1.getCheckboxRecords()
+        if (records.length == 1) {         
+          this.DMLdialog.form.worksortCode = records[0].worksortCode
+          this.DMLdialog.form.worksortName = records[0].worksortName
+          this.DMLdialog.form.id = records[0].id
+        }
+      }
+    },
+    //删除事件
+    deleteItem(flag, row) {
+      if (!flag) {
+        this.$modal
+          .confirm('是否确认删除车间名称为"' + row.WorksortName + '"的数据项？')
+          .then(function () {
+            const array = []
+            array.push(row.id)
+            return delWorksort(array)
+          })
+          .then(() => {
+            this.getList()
+            this.$modal.msgSuccess('删除成功')
+          })
+          .catch(() => {})
+      } else {
+        const records = this.$refs.xTable1.getCheckboxRecords()
+        if (records.length > 0) {
+          this.$modal
+            .confirm('是否确认删除车间名称为"' + records.map((it) => it.WorksortName) + '"的数据项？')
+            .then(function () {
+              return delWorksort(records.map((it) => it.id))
+            })
+            .then(() => {
+              this.getList()
+              this.$modal.msgSuccess('删除成功')
+            })
+            .catch(() => {})
+        }
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.delred {
+  ::v-deep .el-icon-delete {
+    color: #f56c6c;
+  }
+  ::v-deep span {
+    color: #f56c6c;
+  }
+}
+</style>
diff --git a/ZR.Vue/src/views/basisManagement/process.vue b/ZR.Vue/src/views/basisManagement/process.vue
index e69de29b..1e838741 100644
--- a/ZR.Vue/src/views/basisManagement/process.vue
+++ b/ZR.Vue/src/views/basisManagement/process.vue
@@ -0,0 +1,267 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索部分 -->
+    <div>
+      <el-form :model="search" inline v-show="search.showSearch">
+        <el-form-item label="线体编码 ">
+          <el-input v-model="search.worksortCode" placeholder="输入线体编码"></el-input>
+        </el-form-item>
+        <el-form-item label="线体名称 ">
+          <el-input v-model="search.WorksortName" placeholder="输入线体名称"></el-input>
+        </el-form-item>
+        <el-button icon="el-icon-search" circle @click="getList"></el-button>
+      </el-form>
+    </div>
+    <!-- 按钮排 -->
+    <div>
+      <el-row :gutter="2">
+        <el-col :span="1.5">
+          <el-button type="primary" size="small" @click="addItem">增加</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" size="small" @click="updataItem(true)" :disabled="updateDisable">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" size="small" @click="deleteItem(true)" :disabled="delDisable">删除</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="search.showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+      <el-row>
+        <pagination
+          :v-show="true"
+          :total="pagination.total"
+          :page.sync="pagination.pageNum"
+          :limit.sync="pagination.pageSize"
+          @pagination="getList"
+        />
+      </el-row>
+    </div>
+    <div>
+      <vxe-table
+        border
+        ref="xTable1"
+        :data="table.WorksortList"
+        :loading="table.loading"
+        @checkbox-change="selectChangeEvent"
+        :row-config="{ isHover: true }"
+      >
+        <vxe-column type="checkbox" width="60"></vxe-column>
+        <vxe-column field="worksortCode" title="线体编码" sortable></vxe-column>
+        <vxe-column field="worksortName" title="线体名称" sortable></vxe-column>
+        <vxe-column title="查看工位">
+          <template slot-scope="scope">
+            <el-button type="primary" round @click="updataItem(false, scope.row)">调整工序</el-button>
+          </template>
+        </vxe-column>
+        <vxe-column title="操作" show-overflow>
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="updataItem(false, scope.row)">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteItem(false, scope.row)" class="delred">删除</el-button>
+          </template>
+        </vxe-column>
+      </vxe-table>
+    </div>
+
+    <!-- 弹窗-- 修改和删除 -->
+    <el-dialog :title="DMLdialog.title" :visible.sync="DMLdialog.visiable" width="600px" append-to-body>
+      <el-form ref="DMLdialog" :model="DMLdialog.form" label-width="150px" label-position="left" :rules="DMLdialog.rules">
+        <el-form-item label="工序编码 " prop="worksortCode">
+          <el-input v-model="DMLdialog.form.worksortCode" placeholder="输入工序编码"></el-input>
+        </el-form-item>
+        <el-form-item label="工序名称 " prop="WorksortName">
+          <el-input v-model="DMLdialog.form.worksortName" placeholder="输入车间名称"></el-input>
+        </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 { getWorksortList, insertWorksort, updateWorksort, delWorksort } from '@/api/basisManagement/worksort.js'
+export default {
+  name: 'process', //工艺流程
+  data() {
+    return {
+      //搜索框配置
+      search: {
+        id: '',
+        worksortCode: '',
+        WorksortName: '',
+        showSearch: true,
+      },
+      //表格
+      table: {
+        loading: true,
+        WorksortList: [],
+      },
+      //分页
+      pagination: {
+        total: 0,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      //新增修改数据项配置
+      DMLdialog: {
+        title: '',
+        visiable: false,
+        form: {
+          id: '',
+          worksortCode: '',
+          worksortName: '',
+        },
+        rules: {
+          worksortCode: [{ required: true, message: '工序编码不能为空', trigger: 'blur' }],
+          WorksortName: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
+        },
+      },
+      //修改按钮
+      updateDisable: true,
+      //删除按钮
+      delDisable: true,
+      flag: 'update', //区分修改和删除
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    //获取表格数据
+    getList() {
+      const query = { ...this.search, ...this.pagination }
+      delete query.showSearch
+      getWorksortList(query).then((res) => {
+        if (res.code == 200) {
+          this.table.loading = false
+          this.pagination.total = res.data.item1
+          this.table.WorksortList = res.data.item2
+        }
+      })
+    },
+
+    //行更新
+    handleUpdate(row) {},
+    //行删除
+    handleDelete(row) {},
+    selectChangeEvent({ checked }) {
+      const records = this.$refs.xTable1.getCheckboxRecords()
+      if (records.length == 1) {
+        this.updateDisable = false
+      } else {
+        this.updateDisable = true
+      }
+      if (records.length > 0) {
+        this.delDisable = false
+      } else {
+        this.delDisable = true
+      }
+    },
+    //新增按钮
+    addItem() {
+      this.DMLdialog.title = '新增'
+      this.DMLdialog.visiable = true
+      this.flag = 'add'
+    },
+    //新增确认
+    submitForm() {
+      if (this.flag == 'update') {
+        updateWorksort(this.DMLdialog.form).then((res) => {
+          if (res.code == 200 && res.data == 1) {
+            this.$notify.success('修改成功')
+            this.getList()
+            this.DMLdialog.visiable = false
+            this.reset()
+          }
+        })
+      } else if (this.flag == 'add') {
+        this.$refs['DMLdialog'].validate((valid) => {
+          if (valid) {
+            insertWorksort(this.DMLdialog.form).then((res) => {
+              if (res.code == 200) {
+                this.getList()
+                this.DMLdialog.visiable = false
+                this.reset()
+              }
+            })
+          }
+        })
+      }
+    },
+    cancel() {
+      this.DMLdialog.visiable = false
+      this.reset()
+    },
+    reset() {
+      this.DMLdialog.form = {
+        worksortCode: '',
+        worksortName: '',
+      }
+      this.DMLdialog.form.reset();
+    },
+    //修改事件
+    updataItem(flag, row) {
+      debugger
+      this.DMLdialog.title = '修改'
+      this.DMLdialog.visiable = true
+      this.flag = 'update'
+      if (!flag) {
+        this.DMLdialog.form.worksortCode = row.worksortCode
+        this.DMLdialog.form.worksortName = row.worksortName
+        this.DMLdialog.form.id = row.id
+      } else {
+        const records = this.$refs.xTable1.getCheckboxRecords()
+        if (records.length == 1) {         
+          this.DMLdialog.form.worksortCode = records[0].worksortCode
+          this.DMLdialog.form.worksortName = records[0].worksortName
+          this.DMLdialog.form.id = records[0].id
+        }
+      }
+    },
+    //删除事件
+    deleteItem(flag, row) {
+      if (!flag) {
+        this.$modal
+          .confirm('是否确认删除车间名称为"' + row.WorksortName + '"的数据项？')
+          .then(function () {
+            const array = []
+            array.push(row.id)
+            return delWorksort(array)
+          })
+          .then(() => {
+            this.getList()
+            this.$modal.msgSuccess('删除成功')
+          })
+          .catch(() => {})
+      } else {
+        const records = this.$refs.xTable1.getCheckboxRecords()
+        if (records.length > 0) {
+          this.$modal
+            .confirm('是否确认删除车间名称为"' + records.map((it) => it.WorksortName) + '"的数据项？')
+            .then(function () {
+              return delWorksort(records.map((it) => it.id))
+            })
+            .then(() => {
+              this.getList()
+              this.$modal.msgSuccess('删除成功')
+            })
+            .catch(() => {})
+        }
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.delred {
+  ::v-deep .el-icon-delete {
+    color: #f56c6c;
+  }
+  ::v-deep span {
+    color: #f56c6c;
+  }
+}
+</style>
diff --git a/ZR.Vue/vue.config.js b/ZR.Vue/vue.config.js
index bb1645e1..3aba2233 100644
--- a/ZR.Vue/vue.config.js
+++ b/ZR.Vue/vue.config.js
@@ -39,14 +39,14 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: 'http://192.168.1.30:8888/', // 后端接口地址
+        target: 'http://localhost:8888/', // 后端接口地址
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '' //需要rewrite的
         }
       },
 			"msgHub": {
-				target: 'http://192.168.1.30/msgHub',
+				target: 'http://localhost/msgHub',
 				ws: true,
 				changeOrigin: true,
 				pathRewrite: {