From 28046427d1ff62b0a3ff4557ac8960f2e436fc1c Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 6 Feb 2025 15:00:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?luckysheet=E5=8A=A8=E6=80=81=E5=9F=9F?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.preview | 1 + .env.test | 1 + src/views/modules/base/smartExcel/cpts/excel-view.vue | 6 +++--- src/views/modules/base/smartExcel/filling.vue | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index 0fde813fa..addbaad81 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ VUE_APP_API_SERVER = http://219.146.91.110:30801/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_BIPASS_API_SERVER = /linkdata/linkdata-gateway/route - +VUE_APP_SOCKET_SERVER = ws://219.146.91.110:30801/api # VUE_APP_NODE_ENV=dev_sdtdt VUE_APP_NODE_ENV=dev #项目根路径 diff --git a/.env.preview b/.env.preview index 992725a2f..09fde55e4 100644 --- a/.env.preview +++ b/.env.preview @@ -1,6 +1,7 @@ NODE_ENV=production # VUE_APP_API_SERVER = http://120.27.18.76/api VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api +VUE_APP_SOCKET_SERVER = ws://epmet-preview.elinkservice.cn/api VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=preview VUE_APP_PUBLIC_PATH=epmet-work-pc \ No newline at end of file diff --git a/.env.test b/.env.test index 2bb94e86a..c757167b5 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,6 @@ NODE_ENV=test VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_BIPASS_API_SERVER = https://epmet-test.elinkservice.cn/linkdata/linkdata-gateway/route +VUE_APP_SOCKET_SERVER = ws://epmet-test.elinkservice.cn/api VUE_APP_NODE_ENV=test VUE_APP_PUBLIC_PATH=epmet-work-pc \ No newline at end of file diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue index ac1472824..d5b843df4 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-view.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue @@ -166,9 +166,9 @@ export default { options.gridKey = this.currentId; options.allowUpdate = true; options.container = 'luckysheet' - options.loadUrl = `http://219.146.91.110:30801/api/actual/base/luckySheet/workbook/load?workbookId=${this.currentId}` - options.updateUrl = `ws://219.146.91.110:30801/api/actual/base/ws/luckysheet/${this.currentId}/${id}` - options.loadSheetUrl = `http://219.146.91.110:30801/api/actual/base/luckySheet/workbook/loadSheets` + options.loadUrl = `${process.env.VUE_APP_API_SERVER}/actual/base/luckySheet/workbook/load?workbookId=${this.currentId}` + options.updateUrl = `${process.env.VUE_APP_SOCKET_SERVER}/actual/base/ws/luckysheet/${this.currentId}/${id}` + options.loadSheetUrl = `${process.env.VUE_APP_API_SERVER}/actual/base/luckySheet/workbook/loadSheets` window.luckysheet.create({ ...options, hook: { diff --git a/src/views/modules/base/smartExcel/filling.vue b/src/views/modules/base/smartExcel/filling.vue index 212b7b1d0..567b8c986 100644 --- a/src/views/modules/base/smartExcel/filling.vue +++ b/src/views/modules/base/smartExcel/filling.vue @@ -36,7 +36,7 @@ - From 05d278b09747ed10a45f33d295b39a998881f84d Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 6 Feb 2025 15:08:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B2=E6=8E=89=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=88=86=E5=8F=91=E4=BA=BA=E5=91=98=EF=BC=8C=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E8=81=94?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/smartExcel/cpts/excel-info.vue | 18 ++++++--------- src/views/modules/base/smartExcel/index.vue | 23 ++++++++++++++++++- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/views/modules/base/smartExcel/cpts/excel-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue index 0eb9ac232..55c45b2b4 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-info.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue @@ -37,7 +37,7 @@ -
{{formData.type}}
+
{{formData.type || '数据填报'}}
 @@ -49,9 +49,7 @@
{{formData.totalNum}}人
- 查看接收人员名单 - 调整接受人员 + 调整接收人员
@@ -107,7 +105,7 @@ import { mapGetters } from 'vuex' export default { data() { return { - title:"调整接受人员", + title:"", taskId:"", showType:"", showPersonel:false, @@ -137,16 +135,14 @@ export default { }, handelPersonel() { this.showPersonel = false; - }, - oncClickPersonel(){ - this.showType="adjust" - this.showPersonel=true }, oncClickInfo(value){ this.taskId=this.formData.id this.showType=value - if (value=="info") { - this.title="查看接收人员名单" + if (value=="adjust") { + this.title="调整接收人员名单" + }else if(value === 'edit'){ + this.title = '修改' } this.showPersonel=true diff --git a/src/views/modules/base/smartExcel/index.vue b/src/views/modules/base/smartExcel/index.vue index 397225a9f..f4bc1bd74 100644 --- a/src/views/modules/base/smartExcel/index.vue +++ b/src/views/modules/base/smartExcel/index.vue @@ -34,7 +34,7 @@ - @@ -304,6 +304,27 @@ export default { this.pageNo = 1; this.getTableData(); }, + async handleDel(item){ + let parms = { + id: item.id, + }; + this.$confirm("删除之后无法恢复，确认删除？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + requestPost('/actual/base/communityOneTablePublish/delete', parms).then(res => { + if (res.code == 0) { + this.getTableData() + } + }) + }) + .catch((err) => { + if (err == "cancel") { + } + }); + }, async resetSearch() { this.$refs.ref_searchform.resetFields(); this.pageNo = 1;