From db22e3e0abfa13720346683da99e7f75c96a3eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Wed, 5 Mar 2025 14:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 16 +++++------ src/components/scTable/column.js | 27 ++++++++++++++----- src/components/scTable/index.vue | 1 + src/style/fix.scss | 2 +- src/views/cost/feeRecords/index.vue | 1 - src/views/docsManager/document.vue | 1 - src/views/docsManager/share.vue | 1 - src/views/earlyManager/index.vue | 1 - src/views/inventory/inoutRecord/index.vue | 1 - src/views/order/create-order.vue | 1 - src/views/order/inventoryList/index.vue | 1 - src/views/order/inventoryStatistics/index.vue | 1 - src/views/order/order-edit.vue | 1 - src/views/order/order-info.vue | 1 - src/views/order/order-logs.vue | 1 - src/views/order/orderList/index.vue | 1 - src/views/order/orderPlan/index.vue | 1 - src/views/order/preview-order.vue | 1 - src/views/order/repair-action.vue | 3 +-- src/views/order/repairList/index.vue | 1 - src/views/order/submit-order.vue | 1 - src/views/order/workOrder.vue | 1 - src/views/reports/keepRepairReports/index.vue | 1 - src/views/reports/shipmentReports/index.vue | 1 - src/views/service/faq.vue | 1 - src/views/service/queryRecord.vue | 1 - src/views/setting/advanced/setup/company.vue | 1 - .../setting/advanced/setup/computerRoom.vue | 1 - src/views/setting/advanced/setup/material.vue | 1 - src/views/setting/advanced/setup/region.vue | 1 - .../setting/advanced/setup/regularTime.vue | 1 - .../setting/advanced/setup/spareParts.vue | 1 - src/views/setting/bom/index.vue | 1 - src/views/setting/client/index.vue | 1 - src/views/setting/company/index.vue | 1 - src/views/setting/deptMag/index.vue | 1 - src/views/setting/log/components/ability.vue | 1 - src/views/setting/log/components/command.vue | 1 - .../setting/partsMag/components/info.vue | 1 - .../setting/partsMag/components/library.vue | 1 - src/views/setting/user/company-user-list.vue | 1 - src/views/setting/user/index.vue | 1 - src/views/setting/warehouse/index.vue | 1 - .../shipment/shipmentDataConfirm/index.vue | 1 - src/views/shipment/shipmentList/index.vue | 1 - .../shipment/shipmentStatistics/index.vue | 1 - src/views/userCenter/user/logs.vue | 1 - 47 files changed, 32 insertions(+), 59 deletions(-) diff --git a/.env.production b/.env.production index 6f8ae33..3198248 100644 --- a/.env.production +++ b/.env.production @@ -5,15 +5,15 @@ NODE_ENV = production VUE_APP_TITLE = 象纬云科 # 测试环境 - VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1 - VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1 - VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss - VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss +# VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1 +# VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1 +# VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss +# VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss # 线上环境 # 接口地址 # WS地址 -# VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1 -# VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1 -# VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss -# VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss + VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1 + VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1 + VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss + VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss diff --git a/src/components/scTable/column.js b/src/components/scTable/column.js index af5ab1f..95a3019 100644 --- a/src/components/scTable/column.js +++ b/src/components/scTable/column.js @@ -1,23 +1,38 @@ import { h, resolveComponent } from 'vue' export default { + props: { + currentPage: { + type: Number, + required: true + }, + pageSize: { + type: Number, + required: true + } + }, render() { return h ( resolveComponent("el-table-column"), { - index: this.index, + index:this.index, ...this.$attrs }, this.$slots ) }, methods: { - index(index){ - if(this.$attrs.type=="index"){ - let page = this.$parent.$parent.currentPage - let pageSize = this.$parent.$parent.pageSize - return (page - 1) * pageSize + index + 1 + index(index) { + if (this.$attrs.type === "index") { + if(this.currentPage && this.pageSize){ + return (this.currentPage - 1) * this.pageSize + index + 1; + }else{ + let page = this.$parent.$parent.currentPage + let pageSize = this.$parent.$parent.pageSize + return (page - 1) * pageSize + index + 1 + } } + return index } } } diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index b3b36d9..cf8be8e 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -20,6 +20,7 @@
+