Merge branch 'pro' of https://gitlab-pro.ezijing.com/ezijing-web/saas-dml into pro

src/modules/analyze/marketing/components/MarketingDialog.vue

 <script setup>
 import { SemiSelect } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
 import { useEvent } from '../composables/useEvent'
 import { getEventFunnel, saveEventFunnel } from '../api'
 
+const emit = defineEmits(['update:modelValue'])
 const { eventList } = useEvent()
 const rules = ref([])
 
@@ -27,11 +29,13 @@ async function handelSubmit() {
     return { ...item, sort: index + 1 }
   })
   await saveEventFunnel({ rules: paramsRules })
+  ElMessage.success('保存成功')
+  emit('update:modelValue', false)
 }
 </script>
 
 <template>
-  <el-dialog title="创建营销漏斗分析" width="600">
+  <el-dialog title="创建营销漏斗分析" width="600" @update:modelValue="$emit('update:modelValue')">
     <el-button type="primary" @click="handleAdd">添加漏斗步数</el-button>
     <div class="rule-item" v-for="(item, index) in rules" :key="index">
       <el-button type="primary">{{ index + 1 }}</el-button>

src/modules/analyze/user/views/Index.vue

@@ -49,7 +49,7 @@ const genderOption = computed(() => {
     'path://M21.696 10.368c-0.032-1.888-1.344-3.136-3.2-3.136h-5.12c-1.792 0.032-3.104 1.344-3.104 3.136v6.4c0 0.704 0.48 1.216 1.12 1.248 0.736 0 1.248-0.48 1.248-1.248v-5.6c0-0.16 0.096-0.32 0.16-0.48 0.064 0.16 0.16 0.32 0.16 0.48v17.568c0.032 0.544 0.384 1.024 0.896 1.184 0.992 0.32 1.856-0.32 1.888-1.344v-8.736c0-0.192-0.096-0.512 0.256-0.512 0.32 0 0.224 0.32 0.224 0.512 0 2.88 0 5.728 0.032 8.608 0 0.32 0.064 0.672 0.224 0.928 0.288 0.544 0.96 0.736 1.6 0.544 0.576-0.16 0.96-0.64 0.96-1.312v-17.408c0-0.16 0.096-0.32 0.128-0.48 0.064 0.16 0.16 0.32 0.16 0.48v5.472c0 0.416 0.096 0.8 0.48 1.088 0.384 0.256 0.8 0.32 1.216 0.096 0.512-0.224 0.672-0.672 0.672-1.184 0.015-0.938 0.024-2.044 0.024-3.152s-0.009-2.214-0.026-3.319l0.002 0.167zM15.968 6.912c1.408 0 2.464-1.056 2.464-2.464 0-1.344-1.088-2.432-2.432-2.432s-2.496 1.12-2.464 2.464c0 1.344 1.088 2.4 2.432 2.432z'
   const womanIcon =
     'path://M22.784 16.512c-0.032-0.256-0.096-0.512-0.16-0.768-0.384-2.048-0.832-4.096-1.216-6.144-0.224-1.248-1.44-2.336-2.688-2.336-0.8-0.015-1.743-0.024-2.688-0.024s-1.888 0.009-2.829 0.026l0.141-0.002c-0.16 0-0.352 0-0.512 0.032-1.312 0.384-2.048 1.248-2.304 2.624-0.384 2.176-0.864 4.32-1.28 6.496-0.16 0.736 0.224 1.376 0.864 1.504 0.672 0.128 1.248-0.256 1.408-0.992l1.216-5.92c0.032-0.128 0.096-0.224 0.128-0.352l0.128 0.064c0 0.128 0.032 0.256 0 0.384-0.16 0.8-0.32 1.632-0.48 2.432-0.544 2.624-1.056 5.248-1.6 7.84-0.096 0.48 0.032 0.608 0.512 0.608h1.568v6.56c0 0.896 0.576 1.44 1.44 1.44 0.64 0 1.312-0.576 1.312-1.44-0.032-2.048-0.032-4.096-0.032-6.144v-0.384h0.544v6.592c0 0.736 0.448 1.28 1.12 1.376 0.992 0.128 1.632-0.448 1.632-1.472v-6.528h1.536c0.576 0 0.672-0.096 0.576-0.704l-1.728-8.448c-0.128-0.64-0.256-1.248-0.384-1.888 0-0.064 0.064-0.16 0.096-0.256 0.064 0.064 0.096 0.128 0.16 0.192 0 0.032 0 0.096 0.032 0.16 0.384 1.984 0.8 3.968 1.216 5.952 0.128 0.672 0.736 1.088 1.344 0.96 0.672-0.128 1.056-0.768 0.928-1.44zM16.032 6.912c1.312-0.032 2.4-1.12 2.368-2.464 0-0.010 0-0.022 0-0.033 0-1.332-1.071-2.413-2.399-2.431l-0.002-0c-1.344 0-2.4 1.088-2.4 2.464 0 1.344 1.088 2.464 2.432 2.464z'
-  const [man, woman] = gender.value
+  const [man = { total: 0, group_name: '1' }, woman = { total: 0, group_name: '2' }] = gender.value
   return {
     grid: { left: '60', right: '60' },
     tooltip: {