Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release

lzhe

2024-10-07 a52ce4c9a594e78b5931d487e05d0dd54ac8cd36

Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release

 src/views/console/base/Add.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-05-04 16:37:48
 * @LastEditors: gaoshp
 * @LastEditTime: 2024-10-02 17:15:08
 * @LastEditTime: 2024-10-07 18:01:39
 * @FilePath: /cps-web/src/views/console/base/Add.vue
-->
<template>
@@ -361,10 +361,14 @@
                    }
                })
                if (dates.length > 0) {
                    let ban = this.shiftList.find(v => v.id === ext.modelId)
                    this.months[i].attributes.push({
                        dates: dates.map(v => v.calendarDate),
                        ...ext,
                        highlight: color.stringToColor(ext.modelId)
                        highlight: color.stringToColor(ext.modelId),
                        popover: {
                            label: `${ban?.code}-${ban?.name}`
                        },
                    })
                    this.months[i].attributes[1] = {
                        highlight: true,

 src/views/console/base/Dialog.vue

@@ -313,7 +313,7 @@
                        this.visible = false;
                        this.$message.success("操作成功")
                    } else {
                        this.$alert(res.message, "提示", { type: 'error' })
                        this.$alert(res.msg, "提示", { type: 'error' })
                    }
                } else {
                    return false;