From 33582c8d1b6961046ba243a0a2661f0dfa0cf437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=93=E8=B1=86=E8=B1=86?= <3346088772@qq.comcd> Date: Mon, 25 Sep 2023 17:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 2 +- .env.staging | 2 +- .gitignore | 8 +- public/favicon.ico | Bin 16958 -> 3203 bytes public/index.html | 1 + src/App.vue | 16 +- src/api/abnormalityAlarm/machineTool.js | 19 + src/api/management/codeprogram.js | 45 ++ src/api/management/document.js | 45 ++ src/api/management/documentType.js | 36 + src/api/mes/dv/machinery.js | 65 +- src/api/mes/pro/workorder.js | 7 - src/assets/logo/favicon.png | Bin 0 -> 3203 bytes src/assets/styles/sidebar.scss | 41 +- src/assets/styles/variables.scss | 34 +- .../TaskSelect/taskSelectSingle.vue | 2 - src/components/stockSelect/single.vue | 7 +- src/layout/components/Navbar.vue | 4 +- src/layout/components/Sidebar/Logo.vue | 4 +- src/router/index.js | 234 +++--- src/store/modules/user.js | 126 +-- .../machineTool/abnormalAlarm.vue | 484 ++++++++++++ .../machineTool/historicalAnomalyAlarm.vue | 3 + .../abnormalityAlarm/machineTool/index.vue | 41 + src/views/components/personnelSelection.vue | 537 +++++++++++++ src/views/index.vue | 184 +++-- src/views/login.vue | 4 +- src/views/management/codeprogram.vue | 680 ++++++++++++++++ src/views/management/document.vue | 730 ++++++++++++++++++ src/views/management/documentType.vue | 429 ++++++++++ src/views/mes/cal/plan/index.vue | 416 ++++++---- src/views/mes/dv/machinery/index.vue | 585 +++++++++++--- src/views/mes/pro/feedback/index.vue | 4 - src/views/mes/pro/schedule/index.vue | 2 +- src/views/mes/pro/workorder/index.vue | 27 +- src/views/mes/qc/ipqc/index.vue | 9 - src/views/mes/wm/barcode/index.vue | 101 +-- src/views/mes/wm/issue/line.vue | 6 +- src/views/system/menu/index.vue | 243 ++++-- src/views/system/user/index.vue | 378 ++++++--- vue.config.js | 167 ++-- 42 files changed, 4749 insertions(+), 983 deletions(-) create mode 100644 src/api/abnormalityAlarm/machineTool.js create mode 100644 src/api/management/codeprogram.js create mode 100644 src/api/management/document.js create mode 100644 src/api/management/documentType.js create mode 100644 src/assets/logo/favicon.png create mode 100644 src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue create mode 100644 src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue create mode 100644 src/views/abnormalityAlarm/machineTool/index.vue create mode 100644 src/views/components/personnelSelection.vue create mode 100644 src/views/management/codeprogram.vue create mode 100644 src/views/management/document.vue create mode 100644 src/views/management/documentType.vue diff --git a/.env.development b/.env.development index f2301ee..1a77d53 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,11 @@ # 页面标题 -VUE_APP_TITLE = 苦糖果MES-软件开发记录 +VUE_APP_TITLE = 智能工厂MES系统 # 开发环境配置 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = '/prod-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 93172c2..94172dc 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 苦糖果MES-软件开发记录 +VUE_APP_TITLE = 智能工厂MES系统 # 生产环境配置 ENV = 'production' diff --git a/.env.staging b/.env.staging index 12ce6a0..a046e68 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 苦糖果MES-软件开发记录 +VUE_APP_TITLE = 智能工厂MES系统 NODE_ENV = production diff --git a/.gitignore b/.gitignore index 03d9869..253e46d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,9 @@ selenium-debug.log *.njsproj *.sln *.local -.editorconfig -.eslintignore -.eslintrc.js -.env.* +# .editorconfig +# .eslintignore +# .eslintrc.js +# .env.* package-lock.json yarn.lock diff --git a/public/favicon.ico b/public/favicon.ico index 8e03fd49083339beba5daf8c2107ddfebd1f4126..e3b55f3b86025d02cf989d8715a567c6b22bda8d 100644 GIT binary patch literal 3203 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 <%= webpackConfig.name %> + 智能工厂MES系统 diff --git a/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue new file mode 100644 index 0000000..d8b4778 --- /dev/null +++ b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/abnormalityAlarm/machineTool/index.vue b/src/views/abnormalityAlarm/machineTool/index.vue new file mode 100644 index 0000000..731dbe8 --- /dev/null +++ b/src/views/abnormalityAlarm/machineTool/index.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/views/components/personnelSelection.vue b/src/views/components/personnelSelection.vue new file mode 100644 index 0000000..cc620d9 --- /dev/null +++ b/src/views/components/personnelSelection.vue @@ -0,0 +1,537 @@ + + + + + diff --git a/src/views/index.vue b/src/views/index.vue index 956eff6..36e8cd9 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,51 +1,93 @@ diff --git a/src/views/management/document.vue b/src/views/management/document.vue new file mode 100644 index 0000000..899bdbc --- /dev/null +++ b/src/views/management/document.vue @@ -0,0 +1,730 @@ + + + + + diff --git a/src/views/management/documentType.vue b/src/views/management/documentType.vue new file mode 100644 index 0000000..c50ffe2 --- /dev/null +++ b/src/views/management/documentType.vue @@ -0,0 +1,429 @@ + + + + + diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue index a1c2e22..5639e3b 100644 --- a/src/views/mes/cal/plan/index.vue +++ b/src/views/mes/cal/plan/index.vue @@ -1,8 +1,18 @@ diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue index 45bed37..d747cf2 100644 --- a/src/views/mes/dv/machinery/index.vue +++ b/src/views/mes/dv/machinery/index.vue @@ -16,7 +16,7 @@
- + - 搜索 - 重置 + 搜索 + 重置 @@ -61,7 +76,8 @@ size="mini" @click="handleAdd" v-hasPermi="['mes:dv:machinery:add']" - >新增 + >新增 修改 + >修改 删除 + >删除 导入 + >导入 导出 + >导出 - + - + - - - - - - - - + - + + + + + + + + @@ -147,20 +219,22 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:dv:machinery:edit']" - >修改 + >修改 删除 + >删除 - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - + + + + + + + + + + + + + + + + + + +  选择通知人 + + + + - - + + - + 将文件拖到此处,或点击上传
- 是否更新已经存在的设备数据 + + 是否更新已经存在的设备数据
仅允许导入xls、xlsx格式文件。 - 下载模板 + 下载模板
+ + + + +
+ 取消 + 保存 +
+
\ No newline at end of file + diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue index c5daedc..43ad677 100644 --- a/src/views/mes/pro/feedback/index.vue +++ b/src/views/mes/pro/feedback/index.vue @@ -414,8 +414,6 @@ export default { workstationId: null, workstationCode: null, workstationName: null, - routeId: null, - routeCode: null, processId: null, processCode: null, processName: null, @@ -593,8 +591,6 @@ export default { this.form.processId = row.processId; this.form.processCode = row.processCode; this.form.processName = row.processName; - this.form.routeId = row.routeId; - this.form.routeCode = row.routeCode; this.form.isCheck = row.isCheck; } }, diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue index 57604d0..5cc5919 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -339,7 +339,7 @@ export default { requestDate: null, parentId: null, ancestors: null, - status: 'CONFIRMED', + status: null, }, tasks:{ data: [], diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue index 6aee0e8..3f44e0e 100644 --- a/src/views/mes/pro/workorder/index.vue +++ b/src/views/mes/pro/workorder/index.vue @@ -179,16 +179,8 @@ icon="el-icon-plus" v-if="scope.row.status =='CONFIRMED'" @click="handleAdd(scope.row)" - v-hasPermi="['mes:pro:workorder:update']" + v-hasPermi="['mes:pro:workorder:add']" >新增 - 完成 返回 确 定 - 完成 + 完成 取 消 @@ -366,7 +358,7 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 884e326..e929446 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -27,7 +27,14 @@ - + - 搜索 - 重置 + 搜索 + 重置 @@ -87,7 +102,8 @@ size="mini" @click="handleAdd" v-hasPermi="['system:user:add']" - >新增 + >新增 修改 + >修改 删除 + >删除 导入 + >导入 导出 + >导出 - + - + - - - - - - + + + + + + - + @@ -169,23 +242,37 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']" - >修改 + >修改 删除 - + >删除 + 更多 - 重置密码 - 分配角色 + 重置密码 + 分配角色 @@ -193,7 +280,7 @@ - + - + - + - + - - + + - - + + @@ -261,7 +383,8 @@ v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value" - >{{dict.label}} + >{{ dict.label }} @@ -269,7 +392,11 @@ - + - + - + @@ -309,7 +444,12 @@ - + 将文件拖到此处,或点击上传
- 是否更新已经存在的用户数据 + + 是否更新已经存在的用户数据
仅允许导入xls、xlsx格式文件。 - 下载模板 + 下载模板