diff --git a/src/assets/images/main/red.png b/src/assets/images/main/red.png new file mode 100644 index 000000000..d94ca9ba6 Binary files /dev/null and b/src/assets/images/main/red.png differ diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index ca1a527d3..0c1c0585a 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -30,13 +30,15 @@ + 填报任务 + - 智能分析 + 智能分析 @@ -100,15 +102,13 @@ export default { inject: ['refresh'], data() { return { + dataRed:0, showHeader: true, i18nMessages: messages, updatePassowrdVisible: false, customerName: '', - unreadMsgNum: 0, - noticeList: [], - displayedNoticeList: true }; }, @@ -123,6 +123,7 @@ export default { this.changeCustomerName(); this.pollGetNoticeData(); + this.redDot() }, computed: { userType() { @@ -130,6 +131,15 @@ export default { } }, methods: { + async redDot() { + const url = `/actual/base/communityOneTablePeriodPublish/redDot`; + const { data, code, msg } = await requestGet(url); + if (code == 0) { + this.dataRed=data + } else if (code >= 8000) { + this.$message.error(msg); + } + }, async readClearOne(item) { const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`; const { data, code, msg } = await requestPost(url); diff --git a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue index 99a7510bd..7bc9402fe 100644 --- a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue +++ b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue @@ -36,7 +36,7 @@ - { return item.staffId }) @@ -161,6 +166,9 @@ export default { // this.updateState() } else { + if (!this.formData.completeLimitDay) { + return this.$message.error("完成时限不能为0天") + } const parms = { userIdList: userIdList, id: this.taskId, @@ -328,7 +336,23 @@ export default { computed: { }, - watch: {}, + watch: { + 'formData.taskPeriod': function (newPeriod) { + if (newPeriod === 'once') { + this.formData.completeLimitDay = ''; // 如果是 'once',清空 completeLimitDay 以防止数值冲突 + } else { + this.formData.completeLimitDay = ''; // 如果不是 'once',可以设置一个默认值 + } + }, + 'formData.completeLimitDay': function (newPeriod) { + + if (newPeriod<0) { + console.log(newPeriod,"第一次"); + this.formData.completeLimitDay = ''; // 如果是 'once',清空 completeLimitDay 以防止数值冲突 + } else { + } + } + } } diff --git a/src/views/modules/base/smartExcel/cpts/excel-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue index ecb469139..fb2f77b5a 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-info.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue @@ -14,8 +14,8 @@ - {{ formData.taskStateName }} - + {{ formData.taskStateName }} + @@ -36,24 +36,32 @@ {{formData.createByName}} - + {{formData.type || '数据填报'}} - 每周期的第{{formData.completeLimitDay}}天内完成 + 每周期的第{{formData.completeLimitDay}}天内完成 + [修改] + + - {{formData.startTime.slice(0, 10) }}-{{formData.endTime.slice(0, 10) }} + {{formData.startTime?formData.startTime.slice(0, 10):formData.startTime }}-{{formData.endTime?formData.endTime.slice(0, 10):formData.endTime }} - {{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : '每季度' }} + {{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : + formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : + '每季度' }} @@ -79,28 +87,31 @@ + style="width: 70%;margin-left: 3%; margin-top: 30px;"> - + {{taskPeriod === 'once'?'一次性':`${scope.row.taskPeriodName}`}} - {{ scope.row.resolveNum}}/{{ scope.row.totalNum }} - 查看 + {{ + scope.row.resolveNum}}/{{ scope.row.totalNum }} + 查看 - - - - - + + + + + - + diff --git a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue index bd9b11e31..ebbb5bc7d 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue @@ -91,12 +91,12 @@ export default { }, mounted() { console.log(this.fileUrl, 'fileUrl===');//测试用'http://localhost:9001/epmet-work-pc/test1.xlsx' - const newUrl = this.fileUrl.replace( - /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, - `${location.origin}` - ); - this.urlToFile(newUrl,this.fileName) - // this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName) + // const newUrl = this.fileUrl.replace( + // /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, + // `${location.origin}` + // ); + // this.urlToFile(newUrl,this.fileName) + this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName) }, props: { diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue index 2f272c875..74f23a630 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-view.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue @@ -1,7 +1,7 @@ - 返回 + {{ menuList[0].taskTitle }} {{ menuList[0].agencyName }} @@ -17,9 +17,10 @@ - 自动检查 + 返回 返回 + icon="el-icon-back">返回 + 自动检查 智能填表 diff --git a/src/views/modules/base/smartExcel/cpts/filling-info.vue b/src/views/modules/base/smartExcel/cpts/filling-info.vue index d33af12e6..bd4fc6ab4 100644 --- a/src/views/modules/base/smartExcel/cpts/filling-info.vue +++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue @@ -25,7 +25,7 @@ - 每周期内的第{{formData.completeLimitDay }} 每周期的第{{formData.completeLimitDay }} {{formData.completeLimitHour}} 内完成
{{ menuList[0].agencyName }}