diff --git a/src/views/modules/base/smartExcel/cpts/data-excel.vue b/src/views/modules/base/smartExcel/cpts/data-excel.vue index dd509b640..9b80ed08c 100644 --- a/src/views/modules/base/smartExcel/cpts/data-excel.vue +++ b/src/views/modules/base/smartExcel/cpts/data-excel.vue @@ -89,14 +89,14 @@ watch: {}, async mounted() { console.log(this.infoObj,"sdljkdsfj"); - const newUrl = this.infoObj.url.replace( - /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, - `${location.origin}` - ); - console.log(newUrl); - // this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.infoObj.name) + // const newUrl = this.infoObj.url.replace( + // /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, + // `${location.origin}` + // ); + // console.log(newUrl); + this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.infoObj.name) - this.urlToFile(newUrl, this.fileName) + // this.urlToFile(newUrl, this.fileName) // console.log(this.workbookId, "dskjlfsdklf"); // this.currentId = this.workbookId; // this.loadWorkBook() @@ -145,10 +145,9 @@ handleClickCurrencyEvent(){ console.log(this.infoObj,"this.infoObj.taskTitle"); let parms={ - workbookId:this.workbookId, - taskId:this.infoObj.id + sdId:this.infoObj.id } - let { code, msg } = requestPost('/actual/base/communityOneTableDownloadRecord/save', parms); + let { code, msg } = requestPost('/actual/base/sharedDataHistory/save', parms); console.log(code,"dsfkjkldsf"); exportSheetExcel(luckysheet.getAllSheets(),this.infoObj.taskTitle) diff --git a/src/views/modules/base/smartExcel/cpts/export-view.vue b/src/views/modules/base/smartExcel/cpts/export-view.vue index fa8c3895b..13675311c 100644 --- a/src/views/modules/base/smartExcel/cpts/export-view.vue +++ b/src/views/modules/base/smartExcel/cpts/export-view.vue @@ -9,6 +9,7 @@ 数据列表导出 查看数据统计条件 自动检查 + (操作提示:可双击单元格进行设置统计条件)
导出 @@ -1323,4 +1324,7 @@ export default { color: #3989eb; } } +.red{ + color: red +} \ No newline at end of file diff --git a/src/views/modules/base/smartExcel/cpts/picture-list.vue b/src/views/modules/base/smartExcel/cpts/picture-list.vue index e2c7faa99..9ba9a3a32 100644 --- a/src/views/modules/base/smartExcel/cpts/picture-list.vue +++ b/src/views/modules/base/smartExcel/cpts/picture-list.vue @@ -34,7 +34,7 @@
-
{{ item.name }} +
{{ item.name }}
{{ item.staffName }} diff --git a/src/views/modules/base/smartExcel/cpts/share-excel.vue b/src/views/modules/base/smartExcel/cpts/share-excel.vue index e3b1df07d..71214d9d4 100644 --- a/src/views/modules/base/smartExcel/cpts/share-excel.vue +++ b/src/views/modules/base/smartExcel/cpts/share-excel.vue @@ -11,7 +11,7 @@ @click="handleClickCurrencyEvent('submit')">下载
-
+
diff --git a/src/views/modules/base/smartExcel/sharedSpace.vue b/src/views/modules/base/smartExcel/sharedSpace.vue index c26abb237..84d7e2d84 100644 --- a/src/views/modules/base/smartExcel/sharedSpace.vue +++ b/src/views/modules/base/smartExcel/sharedSpace.vue @@ -68,7 +68,7 @@ layout="sizes, prev, pager, next, total" :total="total"> -
+
@@ -90,7 +90,7 @@
-
+