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-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue index 09ce07a84..2883b1008 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}}人
- 查看接收人员名单 - 调整接受人员 + 调整接收人员
@@ -106,7 +104,7 @@ import { mapGetters } from 'vuex' export default { data() { return { - title:"调整接受人员", + title:"", taskId:"", showType:"", showPersonel:false, @@ -136,7 +134,6 @@ export default { }, handelPersonel() { this.showPersonel = false; - this.getDetail() }, oncClickPersonel(){ this.showType="adjust" @@ -145,10 +142,10 @@ export default { oncClickInfo(value){ this.taskId=this.formData.id this.showType=value - if (value=="info") { - this.title="查看接收人员名单" - }else if (value=="edit") { - this.title="修改" + if (value=="adjust") { + this.title="调整接收人员名单" + }else if(value === 'edit'){ + this.title = '修改' } this.showPersonel=true 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 @@ - 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;