From a2ed86263c6d16b51439291e4cef6f7b4f0711fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Mon, 4 Nov 2024 22:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=85=E9=9A=9C=E7=8E=87?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/setup.js | 23 ++++ src/assets/icons/SpareParts.vue | 13 ++ src/assets/icons/index.js | 1 + src/components/scExport/index.vue | 13 +- src/style/fix.scss | 3 +- src/views/cost/shipmentStatistics/index.vue | 2 + .../setting/advanced/components/addSpare.vue | 90 ++++++++++++ src/views/setting/advanced/index.vue | 11 +- .../setting/advanced/setup/computerRoom.vue | 4 +- .../setting/advanced/setup/spareParts.vue | 130 ++++++++++++++++++ src/views/setting/log/components/ability.vue | 3 +- src/views/setting/log/components/command.vue | 2 + 12 files changed, 283 insertions(+), 12 deletions(-) create mode 100644 src/assets/icons/SpareParts.vue create mode 100644 src/views/setting/advanced/components/addSpare.vue create mode 100644 src/views/setting/advanced/setup/spareParts.vue diff --git a/src/api/model/setup.js b/src/api/model/setup.js index 7be9989..810dcf7 100644 --- a/src/api/model/setup.js +++ b/src/api/model/setup.js @@ -235,6 +235,29 @@ export default { }, } }, + spare:{ + list:{ + url: `${config.API_URL}/spare.parts.failure.rate.list`, + name: "备件故障率列表", + get: async function (data) { + return await http.post(this.url, data); + }, + }, + add:{ + url: `${config.API_URL}/spare.parts.failure.rate.add`, + name: "备件故障率新增", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + delete:{ + url: `${config.API_URL}/spare.parts.failure.rate.delete`, + name: "备件故障率删除", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + }, bom:{ list:{ url: `${config.API_URL}/bom.list`, diff --git a/src/assets/icons/SpareParts.vue b/src/assets/icons/SpareParts.vue new file mode 100644 index 0000000..8041a26 --- /dev/null +++ b/src/assets/icons/SpareParts.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index aed9b86..e020f0b 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -47,6 +47,7 @@ export { default as SmallBell } from './SmallBell.vue' export { default as Right } from './Right.vue' export { default as Customer } from './Customer.vue' export { default as Region } from './Region.vue' +export { default as SpareParts } from './SpareParts.vue' export { default as File7z } from './file/7z.vue' export { default as FileBmp } from './file/Bmp.vue' diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue index 1aebc30..58f782c 100644 --- a/src/components/scExport/index.vue +++ b/src/components/scExport/index.vue @@ -31,12 +31,7 @@ export default { type:{type: String, default: ""} }, watch:{ - // show:{ - // handler(){ - // }, - // immediate:true, - // deep:true - // } + }, data(){ return{ @@ -92,12 +87,18 @@ export default { this.list[9] = item; break; } + + if(res.data && res.data.status == 1100){ + this.$message.warning(res.data.msg); + } + this.$emit('updateShow', item); if(res.data.status==1){ this.down(res.data); } } + }, down(item){ const link = document.createElement('a'); diff --git a/src/style/fix.scss b/src/style/fix.scss index 4159620..469e387 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -115,13 +115,14 @@ .el-main.nopadding .scTable .scTable-total .totalView .total-item .text{margin-right: 4px;} /** 列表上面的检索 */ -.el-main.nopadding .searchMain{display: flex;flex-wrap: wrap;align-items: self-end;padding-bottom: 10px;margin: 15px 0 0 0; border-bottom: 1px solid var(--el-border-color-light);} +.el-main.nopadding .searchMain{position: relative;display: flex;flex-wrap: wrap;align-items: self-end;padding-bottom: 10px;margin: 15px 0 0 0; border-bottom: 1px solid var(--el-border-color-light);} .el-main.nopadding .searchMainNoTop{margin-top: 0;} .el-main.nopadding .searchMain .searchItem{display: flex;flex-direction: column;align-items: flex-start;margin-right: 20px;margin-bottom: 10px;} .el-main.nopadding .searchMain .searchItem .name{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;color: #303133;padding-bottom: 5px;text-align: right;} .el-main.nopadding .searchMain .searchItem .input{width: 230px;height: 28px;} .el-main.nopadding .searchMain .searchItem .el-select--small .el-select__wrapper{height: 100%;} .el-main.nopadding .searchMain .searchItem.searchBtn{display: flex;flex-direction: row;} +.el-main.nopadding .searchMain .exportBtn{position: absolute;bottom: 20px;right: 0;} .el-drawer__body {overflow: auto;padding:0;} .el-popconfirm__main {margin: 14px 0;} diff --git a/src/views/cost/shipmentStatistics/index.vue b/src/views/cost/shipmentStatistics/index.vue index f64d1f8..975498f 100644 --- a/src/views/cost/shipmentStatistics/index.vue +++ b/src/views/cost/shipmentStatistics/index.vue @@ -21,6 +21,8 @@
查询 重置 +
+
下载 diff --git a/src/views/setting/advanced/components/addSpare.vue b/src/views/setting/advanced/components/addSpare.vue new file mode 100644 index 0000000..cf9b2d0 --- /dev/null +++ b/src/views/setting/advanced/components/addSpare.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/views/setting/advanced/index.vue b/src/views/setting/advanced/index.vue index 91661e3..0838497 100644 --- a/src/views/setting/advanced/index.vue +++ b/src/views/setting/advanced/index.vue @@ -50,6 +50,7 @@ export default { material: defineAsyncComponent(() => import('./setup/material')), company: defineAsyncComponent(() => import('./setup/company')), region: defineAsyncComponent(() => import('./setup/region')), + spareParts: defineAsyncComponent(() => import('./setup/spareParts')), }, data() { return { @@ -92,13 +93,19 @@ export default { icon: "sc-icon-Customer", title: "客户资料维护", component: "company", - actions:'crontabAdd' + actions:'addCustomer' }, { icon: "sc-icon-Region", title: "区域地址配置", component: "region", - actions:'crontabAdd' + actions:'regionalAddressAdd' + }, + { + icon: "sc-icon-SpareParts", + title: "备件故障率配置", + component: "spareParts", + actions:'sparePartsFailureRateAdd' }, ] }, diff --git a/src/views/setting/advanced/setup/computerRoom.vue b/src/views/setting/advanced/setup/computerRoom.vue index 35468a2..63e2ffd 100644 --- a/src/views/setting/advanced/setup/computerRoom.vue +++ b/src/views/setting/advanced/setup/computerRoom.vue @@ -62,8 +62,8 @@ export default { this.$refs.table.refresh(); } }, - table_del(row){ - console.log(row) + table_del(){ + } } } diff --git a/src/views/setting/advanced/setup/spareParts.vue b/src/views/setting/advanced/setup/spareParts.vue new file mode 100644 index 0000000..8efb6a4 --- /dev/null +++ b/src/views/setting/advanced/setup/spareParts.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/views/setting/log/components/ability.vue b/src/views/setting/log/components/ability.vue index 3cb947f..69d7c7b 100644 --- a/src/views/setting/log/components/ability.vue +++ b/src/views/setting/log/components/ability.vue @@ -3,10 +3,11 @@
-
查询 重置 +
+
下载 diff --git a/src/views/setting/log/components/command.vue b/src/views/setting/log/components/command.vue index 6252ab1..0b8152a 100644 --- a/src/views/setting/log/components/command.vue +++ b/src/views/setting/log/components/command.vue @@ -7,6 +7,8 @@
查询 重置 +
+
下载