From 2770e9ceac7950ea3b6bdd9e8cdd81941960b26f Mon Sep 17 00:00:00 2001 From: "wenkuan.shi" Date: Tue, 30 Jul 2024 16:17:50 +0800 Subject: [PATCH] =?UTF-8?q?1:=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=202:?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E7=BB=84=203:=E4=BA=BA?= =?UTF-8?q?=E5=B7=A5=E7=AD=89=E7=BA=A7=204:=E8=B4=A7=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 495 +-------- src/api/fanucGroup/currency.js | 36 + src/api/fanucGroup/fanuc.js | 28 + src/api/fanucGroup/fanucGroup.js | 15 + src/api/fanucGroup/labor.js | 21 + src/views/modules/fanuc/currency.vue | 1293 ++++++++++++++++++++++ src/views/modules/fanuc/fanuc.vue | 1327 ++++++++++++++++++++++ src/views/modules/fanuc/fanucGroup.vue | 791 ++++++++++++++ src/views/modules/fanuc/labor.vue | 1399 ++++++++++++++++++++++++ 9 files changed, 4926 insertions(+), 479 deletions(-) create mode 100644 src/api/fanucGroup/currency.js create mode 100644 src/api/fanucGroup/fanuc.js create mode 100644 src/api/fanucGroup/fanucGroup.js create mode 100644 src/api/fanucGroup/labor.js create mode 100644 src/views/modules/fanuc/currency.vue create mode 100644 src/views/modules/fanuc/fanuc.vue create mode 100644 src/views/modules/fanuc/fanucGroup.vue create mode 100644 src/views/modules/fanuc/labor.vue diff --git a/package-lock.json b/package-lock.json index 0ecbcfc..902850b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1846,6 +1846,15 @@ "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz", "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==" }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "block-stream": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", @@ -5242,8 +5251,7 @@ "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" }, "filename-regex": { "version": "2.0.1", @@ -5705,484 +5713,13 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "version": "1.2.13", + "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "optional": true, "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "debug": { - "version": "4.1.1", - "bundled": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.3", - "bundled": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "optional": true - }, - "minipass": { - "version": "2.3.5", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.2.1", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "optional": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.1.1", - "bundled": true, - "optional": true - }, - "needle": { - "version": "2.3.0", - "bundled": true, - "optional": true, - "requires": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.12.0", - "bundled": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.6", - "bundled": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.1", - "bundled": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.3", - "bundled": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "optional": true - }, - "semver": { - "version": "5.7.0", - "bundled": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "tar": { - "version": "4.4.8", - "bundled": true, - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "yallist": { - "version": "3.0.3", - "bundled": true, - "optional": true - } + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "fstream": { @@ -10570,7 +10107,7 @@ }, "moment": { "version": "2.30.1", - "resolved": "https://mirrors.cloud.tencent.com/npm/moment/-/moment-2.30.1.tgz", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==" }, "move-concurrently": { diff --git a/src/api/fanucGroup/currency.js b/src/api/fanucGroup/currency.js new file mode 100644 index 0000000..76c16db --- /dev/null +++ b/src/api/fanucGroup/currency.js @@ -0,0 +1,36 @@ +import { createAPI } from "@/utils/httpRequest.js"; + + +//货币 +//查询 +export const findCurrency= data => createAPI(`/currency/queryAll`,'post',data) +//新增 +export const addCurrency= data => createAPI(`/currency/append`,'post',data) +//修改 +export const updateCurrency= data => createAPI(`/currency/amend`,'post',data) +//删除 +export const deleteCurrency= data => createAPI(`/currency/delete`,'post',data) + + +//货币参考 +//新增 +export const findRefCurrency= data => createAPI(`/ref/currency/queryRefAll`,'post',data) +//新增 +export const addRefCurrency= data => createAPI(`/ref/currency/append`,'post',data) +export const updateRefCurrency= data => createAPI(`/ref/currency/amend`,'post',data) +export const deleteRefCurrency= data => createAPI(`/ref/currency/delete`,'post',data) + + +//货币汇率 +//查询 +export const findExchangeCurrency= data => createAPI(`/currency/exchange/queryExchangeAll`,'post',data) +//新增 +export const addExchangeCurrency= data => createAPI(`/currency/exchange/append`,'post',data) +export const updateExchangeCurrency= data => createAPI(`/currency/exchange/amend`,'post',data) +export const deleteExchangeCurrency= data => createAPI(`/currency/exchange/delete`,'post',data) + + + + + + diff --git a/src/api/fanucGroup/fanuc.js b/src/api/fanucGroup/fanuc.js new file mode 100644 index 0000000..f8bcb75 --- /dev/null +++ b/src/api/fanucGroup/fanuc.js @@ -0,0 +1,28 @@ +import { createAPI } from "@/utils/httpRequest.js"; + + + +//查询 +export const findAll= data => createAPI(`/fanuc/queryAll`,'post',data) + +//修改 +export const updateFanuc= data => createAPI(`/fanuc/amend`,'post',data) + +//查询(获取单个数据) +export const findFanuc= data => createAPI(`/fanuc/queryById`,'post',data) + +//成本新增 +export const appendByCost= data => createAPI(`/cost/append`,'post',data) +//成本查询(绑定加工中心) +export const queryByCost= data => createAPI(`/cost/queryAll`,'post',data) +//成本修改 +export const amendByCost= data => createAPI(`/cost/amend`,'post',data) +//成本删除 +export const deleteByCost= data => createAPI(`/cost/delete`,'post',data) + +//成本查询(绑定人工等级) +export const queryCostByLabor= data => createAPI(`/cost/queryByLabor`,'post',data) + + + + diff --git a/src/api/fanucGroup/fanucGroup.js b/src/api/fanucGroup/fanucGroup.js new file mode 100644 index 0000000..3ecd44f --- /dev/null +++ b/src/api/fanucGroup/fanucGroup.js @@ -0,0 +1,15 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +//新增 +export const saveFanuc= data => createAPI(`/fanucGroup/append`,'post',data) + +//查询 +export const findAll= data => createAPI(`/fanucGroup/queryAll`,'post',data) + +//修改 +export const updateFanuc= data => createAPI(`/fanucGroup/amend`,'post',data) + +//删除 +export const deleteFanuc= data => createAPI(`/fanucGroup/delete`,'post',data) +//获取用户bu +export const getSiteAndBuByUserName= data => createAPI(`/pms/eam/getSiteAndBuByUserName`,'post',data) diff --git a/src/api/fanucGroup/labor.js b/src/api/fanucGroup/labor.js new file mode 100644 index 0000000..0348890 --- /dev/null +++ b/src/api/fanucGroup/labor.js @@ -0,0 +1,21 @@ +import { createAPI } from "@/utils/httpRequest.js"; + + + +//查询 +export const findAll= data => createAPI(`/labor/queryAll`,'post',data) +//新增 +export const insertByLabor= data => createAPI(`/labor/append`,'post',data) +//修改 +export const updateLabor= data => createAPI(`/labor/amend`,'post',data) +//删除 +export const deleteLabor= data => createAPI(`/labor/delete`,'post',data) + + +//查询(获取单个数据) +export const findByLabor= data => createAPI(`/labor/queryById`,'post',data) + + + + + diff --git a/src/views/modules/fanuc/currency.vue b/src/views/modules/fanuc/currency.vue new file mode 100644 index 0000000..c6cb2ca --- /dev/null +++ b/src/views/modules/fanuc/currency.vue @@ -0,0 +1,1293 @@ + + + diff --git a/src/views/modules/fanuc/fanuc.vue b/src/views/modules/fanuc/fanuc.vue new file mode 100644 index 0000000..3f63024 --- /dev/null +++ b/src/views/modules/fanuc/fanuc.vue @@ -0,0 +1,1327 @@ + + + diff --git a/src/views/modules/fanuc/fanucGroup.vue b/src/views/modules/fanuc/fanucGroup.vue new file mode 100644 index 0000000..78f410e --- /dev/null +++ b/src/views/modules/fanuc/fanucGroup.vue @@ -0,0 +1,791 @@ + + + diff --git a/src/views/modules/fanuc/labor.vue b/src/views/modules/fanuc/labor.vue new file mode 100644 index 0000000..b1b4a19 --- /dev/null +++ b/src/views/modules/fanuc/labor.vue @@ -0,0 +1,1399 @@ + + +