基于青半mes提交成飞分支

.env.development

@@ -10,7 +10,7 @@ VITE_APP_BASE_API = '/dev-api'
 # 上传文件接口地址
 VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # 开发接口地址
- VITE_APP_API_URL = 'http://192.168.101.4:7104'
+ VITE_APP_API_URL = 'http://127.0.0.1:7104'
 
 
 # 是否启用 Mock 服务

.env.production

@@ -1,4 +1,4 @@
-## 生产环境
+## 维修环境
 NODE_ENV='production'
 
 # 上传文件接口地址

docker/Dockerfile

@@ -7,7 +7,7 @@ RUN echo "server {  \
                       listen       80; \
                       client_max_body_size 100m;\
                       location   /mes-server/ { \
-                      proxy_pass              http://192.168.101.4:7104/; \
+                      proxy_pass              http://192.168.101.4:7204/; \
                       proxy_redirect          off; \
                       proxy_set_header        Host mes-server; \
                       proxy_set_header        X-Real-IP \$remote_addr; \

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "3.0"
+  "version": "3.5"
 }

src/api/excel/index.ts

@@ -86,7 +86,7 @@ export function deleteSettingsData(data: any) {
     data,
   });
 }
-//生产履历修改EXcell数据（实际为新增）
+//维修履历修改EXcell数据（实际为新增）
 export function setExcelData(data: any) {
   return request({
     url: "/api/v1/ProcessFormData/add",
@@ -94,7 +94,7 @@ export function setExcelData(data: any) {
     data,
   });
 }
-// 生产随工单Exceldata获取
+// 维修随工单Exceldata获取
 export function getProExcel(id: any) {
   return request({
     url: `/api/v1/ProcessFormData/getExcel/${id}`,
@@ -102,7 +102,7 @@ export function getProExcel(id: any) {
   });
 }
 
-//生产随工单更新
+//维修随工单更新
 export function updateProExcel(data: any) {
   return request({
     url: `/api/v1/ProcessFormData/updateExcel`,

src/common/configs/dictDataUtil.ts

@@ -49,13 +49,13 @@ const DictDataUtil = {
     vehicle_type: "vehicle_type",
     //载具状态
     vehicle_state: "vehicle_state",
-    //生产准备-设备信息
+    //维修准备-设备信息
     prepare_device_info: "prepare_device_info",
-    //生产准备-图纸
+    //维修准备-图纸
     prepare_data_file: "prepare_data_file",
-    //生产准备-工艺文件
+    //维修准备-工艺文件
     prepare_craft_file: "prepare_craft_file",
-    //   生产计划-工位任务状态
+    //   维修计划-工位任务状态
     station_task_state: "station_task_state",
     //领用申请状态
     requisition_state: "requisition_state",

src/views/base/accessories/index.vue

@@ -129,7 +129,7 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "生产物料编码不能为空",
+          message: "维修物料编码不能为空",
           trigger: "change",
         },
       ],

src/views/base/bom/index.vue

@@ -13,7 +13,7 @@
       <div class="title-detail">单位 : {{ dataDetail.unitDictValue }}</div>
       <div class="title-detail">物料级别 : {{ dataDetail.levelDictValue }}</div>
       <div class="title-detail">产品阶段 : {{ dataDetail.stageDictValue }}</div>
-      <div class="title-detail">生产厂家 : {{ dataDetail.manufacturer }}</div>
+      <div class="title-detail">维修厂家 : {{ dataDetail.manufacturer }}</div>
       <div class="title-detail">创建时间 : {{ dataDetail.created }}</div>
       <div class="title-detail">备注 : {{ dataDetail.remark }}</div>
     </div>

src/views/base/craftManagement/route/components/CustomConnectionLine/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- 此页面更改线条样式 -->
   <g>
     <!-- 圆形markStart -->
     <circle

src/views/base/materials/columns.ts

@@ -60,9 +60,9 @@ export const columns = [
       trigger: "blur"
     }],
   },
-  { label: "生产厂家", prop: "manufacturer",width: 100,overHidden: true ,rules: [{
+  { label: "维修厂家", prop: "manufacturer",width: 100,overHidden: true ,rules: [{
       required: true,
-      message: "请填写生产厂家",
+      message: "请填写维修厂家",
       trigger: "blur"
     }],},
   {

src/views/base/materials/components/choice-item-page.vue

@@ -88,7 +88,7 @@ option.value = Object.assign(option.value, {
       dicData:dicts.material_level,
       props: { label: "dictLabel", value: "dictValue" },
     },
-    { label: "生产厂家",width: 120, overHidden: true,prop: "manufacturer"},
+    { label: "维修厂家",width: 120, overHidden: true,prop: "manufacturer"},
     {
       label: "质检方案",
       prop: "inspectDictValue",

src/views/base/materials/index.vue

@@ -241,14 +241,14 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "生产厂家",
+      label: "维修厂家",
       prop: "manufacturer",
       width: 100,
       overHidden: true,
       rules: [
         {
           required: true,
-          message: "请填写生产厂家",
+          message: "请填写维修厂家",
           trigger: "blur",
         },
       ],

src/views/device/allocate/index.vue

@@ -287,7 +287,7 @@
           "
         >
           <el-card v-if="viewPage">
-            <h4>科研生产部设备管理员</h4>
+            <h4>科研维修部设备管理员</h4>
             <p>审批人员： {{ maintenanceInfo.auditUser2 }}</p>
             <p>审批意见： {{ maintenanceInfo.auditOpinion2 }}</p>
             <p>
@@ -303,7 +303,7 @@
             <p>审批时间： {{ maintenanceInfo.auditTime2 }}</p>
           </el-card>
           <el-card v-if="!viewPage">
-            <h4>科研生产部设备管理员</h4>
+            <h4>科研维修部设备管理员</h4>
             <el-form
               ref="maintenanceInfoForm2"
               v-if="maintenanceInfo.state >= 4"
@@ -369,7 +369,7 @@
           "
         >
           <el-card v-if="viewPage">
-            <h4>科研生产部负责人</h4>
+            <h4>科研维修部负责人</h4>
             <p>审批人员： {{ maintenanceInfo.auditUser3 }}</p>
             <p>审批意见： {{ maintenanceInfo.auditOpinion3 }}</p>
             <p>
@@ -385,7 +385,7 @@
             <p>审批时间： {{ maintenanceInfo.auditTime3 }}</p>
           </el-card>
           <el-card v-if="!viewPage">
-            <h4>科研生产部负责人</h4>
+            <h4>科研维修部负责人</h4>
             <el-form
               ref="maintenanceInfoForm3"
               v-if="maintenanceInfo.state >= 6"
@@ -993,7 +993,7 @@ option.value = Object.assign(option.value, {
         { label: "驳回", value: 3 },
         { label: "待设备管理员审核", value: 4 },
         { label: "驳回", value: 5 },
-        { label: "待科研生产部负责人审核", value: 6 },
+        { label: "待科研维修部负责人审核", value: 6 },
         { label: "驳回", value: 7 },
         { label: "待公司分管领导审核", value: 8 },
         { label: "驳回", value: 9 },

src/views/device/disable/index.vue

@@ -246,7 +246,7 @@
           "
         >
           <el-card v-if="viewPage">
-            <h4>科研生产部</h4>
+            <h4>科研维修部</h4>
             <p>审批人员： {{ maintenanceInfo.auditUser1 }}</p>
             <p>
               审批结果：
@@ -261,7 +261,7 @@
             <p>审批时间： {{ maintenanceInfo.auditTime1 }}</p>
           </el-card>
           <el-card v-if="!viewPage">
-            <h4>科研生产部</h4>
+            <h4>科研维修部</h4>
             <el-form
               ref="maintenanceInfoForm2"
               v-if="maintenanceInfo.state >= 4"
@@ -575,7 +575,7 @@ option.value = Object.assign(option.value, {
         { label: "驳回", value: 1 },
         { label: "待使用部门负责人审核", value: 2 },
         { label: "驳回", value: 3 },
-        { label: "待科研生产部审核", value: 4 },
+        { label: "待科研维修部审核", value: 4 },
         { label: "驳回", value: 5 },
         { label: "已完成", value: 6 },
       ],

src/views/device/repair/index.vue

@@ -193,7 +193,7 @@
           "
         >
           <el-card v-if="viewPage">
-            <h4>科研生产部设备管理员计量意见</h4>
+            <h4>科研维修部设备管理员计量意见</h4>
             <p>审批人员： {{ maintenanceInfo.auditUser }}</p>
             <p>
               审批结果：
@@ -207,7 +207,7 @@
             </p>
           </el-card>
           <el-card v-if="!viewPage">
-            <h4>科研生产部设备管理员意见</h4>
+            <h4>科研维修部设备管理员意见</h4>
             <el-form
               ref="maintenanceInfoForm2"
               v-if="maintenanceInfo.state >= 1"
@@ -277,7 +277,7 @@
           "
         >
           <el-card v-if="viewPage">
-            <h4>科研生产部负责人计量意见</h4>
+            <h4>科研维修部负责人计量意见</h4>
             <p>审批人员： {{ maintenanceInfo.auditUser }}</p>
             <p>
               审批结果：
@@ -291,7 +291,7 @@
             </p>
           </el-card>
           <el-card v-if="!viewPage">
-            <h4>科研生产部负责人意见</h4>
+            <h4>科研维修部负责人意见</h4>
             <el-form
               ref="maintenanceInfoForm3"
               v-if="maintenanceInfo.state >= 3"
@@ -843,9 +843,9 @@ option.value = Object.assign(option.value, {
       overHidden: true,
       dicData: [
         { label: "待维修", value: 0 },
-        { label: "待科研生产部设备管理员审批 ", value: 1 },
+        { label: "待科研维修部设备管理员审批 ", value: 1 },
         { label: "审核不通过", value: 2 },
-        { label: "待科研生产部负责人审批", value: 3 },
+        { label: "待科研维修部负责人审批", value: 3 },
         { label: "审核不通过", value: 4 },
         { label: "待使用人审核", value: 5 },
         { label: "审核不通过", value: 6 },

src/views/plan/order/index.vue

@@ -562,7 +562,7 @@ option.value = {
       value: 0,
     },
     {
-      label: "生产类型",
+      label: "维修类型",
       prop: "produceType",
       width: 100,
       overHidden: true,
@@ -575,7 +575,7 @@ option.value = {
       rules: [
         {
           required: true,
-          message: "请选择生产类型",
+          message: "请选择维修类型",
           trigger: "trigger",
         },
       ],

src/views/plan/workOrder/components/proWorkOrderExcel.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dialogBody">
-    <!-- 生产随工单 -->
+    <!-- 维修随工单 -->
     <div class="exView" :key="excelKey1">
       <ExcelView
         ref="excelViewRef"

src/views/plan/workOrder/components/work-order-page.vue

@@ -139,7 +139,7 @@ option.value = Object.assign(option.value, {
       overHidden: true,
     },
     {
-      label: "生产车间",
+      label: "维修车间",
       prop: "workshopName",
       width: 120,
       overHidden: true,

src/views/plan/workOrder/index.vue

@@ -125,7 +125,7 @@
           @click="jumpPage(row.workOrderCode, 2)"
           type="primary"
           :size="size"
-          >生产准备</el-button
+          >维修准备</el-button
         >
         <el-button
           icon="el-icon-setting"
@@ -134,7 +134,7 @@
           type="primary"
           v-if="row.workOrderState > 3"
           :size="size"
-          >生产随工单</el-button
+          >维修随工单</el-button
         >
         <!--        <el-button
           icon="el-icon-notebook"
@@ -144,7 +144,7 @@
           type="primary"
           v-hasPerm="[buttonPermission.PLAN.BTNS.work_order_data]"
           :size="size"
-          >生成生产随工单</el-button
+          >生成维修随工单</el-button
         >-->
         <!--        <el-button
           icon="el-icon-download"
@@ -278,7 +278,7 @@
         </div>
       </template>
     </el-dialog>
-    <!-- 生产随工单 -->
+    <!-- 维修随工单 -->
     <el-dialog
       v-model="workOderShow"
       :title="updateTitle"
@@ -312,7 +312,7 @@ import { getProExcel } from "@/api/excel";
 import proWorkOrderExcel from "./components/proWorkOrderExcel.vue";
 import { getWorkshopData } from "@/api/report";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-const updateTitle = ref("生产随工单");
+const updateTitle = ref("维修随工单");
 const workshopName = ref("");
 const router = useRouter();
 const workOderShow = ref(false);
@@ -733,14 +733,14 @@ option.value = Object.assign(option.value, {
       },
     },
     {
-      label: "生产车间",
+      label: "维修车间",
       prop: "workshopName",
       width: 120,
       overHidden: true,
       rules: [
         {
           required: true,
-          message: "生产车间不能为空",
+          message: "维修车间不能为空",
           trigger: "trigger",
         },
       ],
@@ -776,7 +776,7 @@ option.value = Object.assign(option.value, {
         if (column.boxType) {
           if (!form.value.workshopName) {
             ElMessage({
-              message: "请先选择生产车间",
+              message: "请先选择维修车间",
               type: "warning",
             });
             return;

src/views/pro/traceability/components/traceabilityCom.vue

@@ -1,4 +1,4 @@
-<!-- 生产履历 -->
+<!-- 维修履历 -->
 <template>
   <div class="mainContentBox">
     <avue-crud
@@ -89,7 +89,7 @@ option.value = Object.assign(option.value, {
   header: false,
   column: [
     {
-      label: "生产过程id",
+      label: "维修过程id",
       prop: "id",
       display: false,
       hide: true,

src/views/pro/traceability/components/traceabilityCom.vue~

@@ -1,211 +0,0 @@
-<!-- 生产履历 -->
-<template>
-  <div class="mainContentBox">
-    <avue-crud
-      ref="crudRef2"
-      v-model:search="search"
-      v-model="form"
-      :data="data"
-      :option="option"
-      @row-update="updateRow"
-      v-model:page="page"
-    />
-    <CommonTable
-      ref="userRef"
-      tableTitle="操作人选择"
-      tableType="USERS"
-      @selected-sure="onUserSelectedFinish"
-    />
-  </div>
-</template>
-<script setup>
-import { ref, getCurrentInstance } from "vue";
-import { useCrud } from "@/hooks/userCrud";
-import dictDataUtil from "@/common/configs/dictDataUtil";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
-import {
-  useCommonStoreHook,
-  useDictionaryStore,
-  useUserStoreHook,
-} from "@/store";
-
-// 数据字典相关
-const { dicts } = useDictionaryStore();
-const userStore = useUserStoreHook();
-
-// 传入一个url，后面不带/
-const {
-  form,
-  data,
-  option,
-  search,
-  page,
-  toDeleteIds,
-  Methords,
-  Utils,
-  commonConfig,
-} = useCrud({
-  src: "/api/v1/process/info",
-});
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
-  Methords; //增删改查
-const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
-const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-const onUserSelectedFinish = (selectedValue) => {
-  form.value.operator = selectedValue.userName;
-};
-const crudRef = ref(null); //crudRef.value 获取avue-crud对象
-const userRef = ref(null);
-const refreshTra = (row) => {
-  commonConfig.value.params = { seqNo: row.seqNo };
-  dataList();
-};
-defineExpose({ refreshTra });
-onMounted(() => {
-  if (userStore.user.userId === 10000) {
-    option.value.menu = true;
-    option.value.editBtn = true;
-  }
-});
-
-option.value = Object.assign(option.value, {
-  selection: false,
-  border: true,
-  index: false,
-  expandLevel: 3,
-  headerAlign: "center",
-  align: "center",
-  labelWidth: 100,
-  addBtn: false,
-  delBtn: false,
-  menuWidth: 100,
-  editBtn: false,
-  viewBtn: false,
-  menu: false,
-  header: false,
-  column: [
-    {
-      label: "生产过程id",
-      prop: "id",
-      display: false,
-      hide: true,
-      width: 120,
-    },
-    {
-      label: "工序名称",
-      prop: "operationName",
-      editDisplay: false,
-      width: 120,
-    },
-    {
-      label: "工段",
-      prop: "workSection",
-      editDisplay: false,
-      type: "select",
-      dicData: dicts.workshop_section,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
-      },
-    },
-    {
-      label: "状态",
-      editDisplay: false,
-      prop: "currentState",
-      search: false,
-      dicData: dicts.process_state,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
-      },
-    },
-    {
-      label: "开始时间",
-      prop: "realStartWhen",
-      search: false,
-      format: "YYYY-MM-DD HH:mm:ss",
-      valueFormat: "YYYY-MM-DD HH:mm:ss",
-      width: 160,
-      type: "datetime",
-      rules: [
-        {
-          validator: (rule, value, callback) => {
-            if (value == null || form.value.realEndWhen == null) {
-              callback();
-            } else if (
-              new Date(value).getTime() <=
-              new Date(form.value.realEndWhen).getTime()
-            ) {
-              callback();
-            } else {
-              callback(new Error("开始时间应小于等于结束时间"));
-            }
-          },
-          message: "开始时间应小于等于结束时间",
-          required: true,
-          trigger: "change",
-        },
-      ],
-    },
-    {
-      label: "结束时间",
-      prop: "realEndWhen",
-      format: "YYYY-MM-DD HH:mm:ss",
-      valueFormat: "YYYY-MM-DD HH:mm:ss",
-      width: 160,
-      type: "datetime",
-      rules: [
-        {
-          validator: (rule, value, callback) => {
-            if (value == null || form.value.realStartWhen == null) {
-              callback();
-            } else if (
-              new Date(value).getTime() >=
-              new Date(form.value.realStartWhen).getTime()
-            ) {
-              callback();
-            } else {
-              callback(new Error("\结束时间应大于等于结束时间"));
-            }
-          },
-          required: true,
-          message: "结束时间应大于等于开始时间",
-          trigger: "change",
-        },
-      ],
-    },
-    {
-      label: "操作人",
-      prop: "operator",
-      search: false,
-      width: 100,
-      overHidden: true,
-      click: ({ value, column }) => {
-        userRef.value.startSelect();
-      },
-    },
-    {
-      label: "工时(秒)",
-      prop: "totalTime",
-      editDisplay: false,
-      search: false,
-    },
-    {
-      label: "工步",
-      prop: "operationSort",
-      editDisplay: false,
-      search: false,
-    },
-  ],
-});
-
-// const validateTimeEnd = (rule, value, callback) => {
-//   if (value === "") {
-//     callback(new Error("Please input the password again"));
-//   } else if (value !== ruleForm.pass) {
-//     callback(new Error("Two inputs don't match!"));
-//   } else {
-//     callback();
-//   }
-// };
-</script>

src/views/pro/traceability/index.vue

@@ -61,10 +61,10 @@
             @tab-click="tabsEvent"
             v-model="defaultTabName"
           >
-            <el-tab-pane name="traceabilityComRef" label="生产履历">
+            <el-tab-pane name="traceabilityComRef" label="维修履历">
               <template #label>
                 <span
-                  >生产履历
+                  >维修履历
                   <el-badge
                     :value="tabCount.traceability"
                     class="item"

src/views/quality/reverseTraceability/index.vue

@@ -91,7 +91,7 @@ option.value = Object.assign(option.value, {
       search: true,
     },
     {
-      label: "生产过程id",
+      label: "维修过程id",
       prop: "processId",
       hide: true,
     },

src/views/report/environment/equipment/index.vue

@@ -64,7 +64,7 @@ onMounted(() => {
       device_name: "设备名称",
       liyonglv: "设备利用率",
       xiaolv: "综合效率",
-      shengcl: "安全有效生产率",
+      shengcl: "安全有效维修率",
       pjgz: "平均故障间隔时间",
       pjbysj: "设备平均保养时间",
       wgzgzsj: "平均无故障工作时间(MTBF)",
@@ -99,7 +99,7 @@ option.value = Object.assign(option.value, {
       prop: "xiaolv",
     },
     {
-      label: "安全有效生产率",
+      label: "安全有效维修率",
       prop: "shengcl",
     },
     {

src/views/report/statistics/workeveryday/index.vue

@@ -145,7 +145,7 @@ const echartOption1 = ref({
 });
 const echartOption2 = ref({
   title: {
-    text: "生产趋势图",
+    text: "维修趋势图",
   },
   tooltip: {
     trigger: "axis",
@@ -197,7 +197,7 @@ const ckickCell = (row) => {
     chartsSearch.value.operationCode = row.operationCode;
     chartsSearch.value.orderCode = row.orderCode;
     chartsSearch.value.searchTime = data1.value.search.searchTime;
-    echartOption2.value.title.text = row.orderName + ": 生产趋势图";
+    echartOption2.value.title.text = row.orderName + ": 维修趋势图";
     await setChartsData2();
     echartOption2.value.xAxis[0].data = chartsData2.value.dateList;
     echartOption2.value.series[0].data = chartsData2.value.total;

vite.config.ts

@@ -212,8 +212,8 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       terserOptions: {
         compress: {
           keep_infinity: true, // 防止 Infinity 被压缩成 1/0，这可能会导致 Chrome 上的性能问题
-          drop_console: true, // 生产环境去除 console
-          drop_debugger: true, // 生产环境去除 debugger
+          drop_console: true, // 维修环境去除 console
+          drop_debugger: true, // 维修环境去除 debugger
         },
         format: {
           comments: false, // 删除注释

vite.config.ts.timestamp-1718780321854-379d34a92f5ac.mjs

@@ -286,9 +286,9 @@ var vite_config_default = defineConfig(({ mode }) => {
           keep_infinity: true,
           // 防止 Infinity 被压缩成 1/0，这可能会导致 Chrome 上的性能问题
           drop_console: true,
-          // 生产环境去除 console
+          // 维修环境去除 console
           drop_debugger: true
-          // 生产环境去除 debugger
+          // 维修环境去除 debugger
         },
         format: {
           comments: false