diff --git a/src/views/modules/base/smartExcel/cpts/data-excel.vue b/src/views/modules/base/smartExcel/cpts/data-excel.vue index c125e020b..d7d1dbcc4 100644 --- a/src/views/modules/base/smartExcel/cpts/data-excel.vue +++ b/src/views/modules/base/smartExcel/cpts/data-excel.vue @@ -89,14 +89,13 @@ 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}` - // ); + 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('http://localhost:9001/epmet-work-pc/test1.xlsx',this.infoObj.name) + this.urlToFile(newUrl, this.fileName) // console.log(this.workbookId, "dskjlfsdklf"); // this.currentId = this.workbookId; // this.loadWorkBook() diff --git a/src/views/modules/base/smartExcel/cpts/export-view.vue b/src/views/modules/base/smartExcel/cpts/export-view.vue index 555cf3f84..2397cc1a3 100644 --- a/src/views/modules/base/smartExcel/cpts/export-view.vue +++ b/src/views/modules/base/smartExcel/cpts/export-view.vue @@ -9,7 +9,7 @@ 数据列表导出 查看数据统计条件 自动检查 - (操作提示:可双击单元格进行设置统计条件) + (操作提示:可双击单元格进行设置统计条件)
导出 diff --git a/src/views/modules/base/smartExcel/sharedSpace.vue b/src/views/modules/base/smartExcel/sharedSpace.vue index 224a0ee6e..71e1daf79 100644 --- a/src/views/modules/base/smartExcel/sharedSpace.vue +++ b/src/views/modules/base/smartExcel/sharedSpace.vue @@ -461,9 +461,9 @@ if (code === 0) { this.total = data.total || 0; this.tableData = data.list - ? data.list.map((item) => { - return item; - }) + ? data.list + .filter((item) => item.taskStateName !== '未提交') // 筛选掉 '未提交' + .map((item) => item) // 这里可以省略 map,直接赋值 : []; } else { this.$message.error(msg); diff --git a/src/views/modules/shequzhili/analysis/index.vue b/src/views/modules/shequzhili/analysis/index.vue index 775fe8f26..0d705f18f 100644 --- a/src/views/modules/shequzhili/analysis/index.vue +++ b/src/views/modules/shequzhili/analysis/index.vue @@ -74,7 +74,7 @@
-
派件/派件
+
收件/派件
@@ -258,13 +258,25 @@ + + + +
@@ -306,13 +318,25 @@ + + + +
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-assign.vue b/src/views/modules/shequzhili/event/cpts/process-form-assign.vue index 4e75ee6c0..3b1551751 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-assign.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-assign.vue @@ -138,48 +138,20 @@ export default { keyword:"", sourceList: [ { - value: "来电", - label: "来电", + value: "中国政府网", + label: "中国政府网", }, { - value: "信箱", - label: "信箱", + value: "互联网督查", + label: "互联网督查", }, { - value: "青岛来电", - label: "青岛来电", + value: "问政山东", + label: "问政山东", }, { - value: "青岛短信", - label: "青岛短信", - }, - { - value: "青岛信箱", - label: "青岛信箱", - }, - { - value: "青岛网站", - label: "青岛网站", - }, - { - value: "青岛微信", - label: "青岛微信", - }, - { - value: "青岛手机APP", - label: "青岛手机APP", - }, - { - value: "青岛网络舆情", - label: "青岛网络舆情", - }, - { - value: "青岛人民网", - label: "青岛人民网", - }, - { - value: "青岛人民来信", - label: "青岛人民来信", + value: "问政青岛", + label: "问政青岛", }, ], sysAdvancedList:{},