提交 9ff2f106 authored 作者: 王鹏飞's avatar 王鹏飞

chore: 升级相关依赖

上级 5b3d7288
...@@ -292,6 +292,9 @@ ...@@ -292,6 +292,9 @@
"ExtractDefaultPropTypes": true, "ExtractDefaultPropTypes": true,
"ExtractPropTypes": true, "ExtractPropTypes": true,
"ExtractPublicPropTypes": true, "ExtractPublicPropTypes": true,
"WritableComputedRef": true "WritableComputedRef": true,
"injectLocal": true,
"provideLocal": true,
"useClipboardItems": true
} }
} }
...@@ -44,6 +44,7 @@ declare global { ...@@ -44,6 +44,7 @@ declare global {
const h: typeof import('vue')['h'] const h: typeof import('vue')['h']
const ignorableWatch: typeof import('@vueuse/core')['ignorableWatch'] const ignorableWatch: typeof import('@vueuse/core')['ignorableWatch']
const inject: typeof import('vue')['inject'] const inject: typeof import('vue')['inject']
const injectLocal: typeof import('@vueuse/core')['injectLocal']
const isDefined: typeof import('@vueuse/core')['isDefined'] const isDefined: typeof import('@vueuse/core')['isDefined']
const isProxy: typeof import('vue')['isProxy'] const isProxy: typeof import('vue')['isProxy']
const isReactive: typeof import('vue')['isReactive'] const isReactive: typeof import('vue')['isReactive']
...@@ -73,6 +74,7 @@ declare global { ...@@ -73,6 +74,7 @@ declare global {
const onUpdated: typeof import('vue')['onUpdated'] const onUpdated: typeof import('vue')['onUpdated']
const pausableWatch: typeof import('@vueuse/core')['pausableWatch'] const pausableWatch: typeof import('@vueuse/core')['pausableWatch']
const provide: typeof import('vue')['provide'] const provide: typeof import('vue')['provide']
const provideLocal: typeof import('@vueuse/core')['provideLocal']
const reactify: typeof import('@vueuse/core')['reactify'] const reactify: typeof import('@vueuse/core')['reactify']
const reactifyObject: typeof import('@vueuse/core')['reactifyObject'] const reactifyObject: typeof import('@vueuse/core')['reactifyObject']
const reactive: typeof import('vue')['reactive'] const reactive: typeof import('vue')['reactive']
...@@ -136,6 +138,7 @@ declare global { ...@@ -136,6 +138,7 @@ declare global {
const useBrowserLocation: typeof import('@vueuse/core')['useBrowserLocation'] const useBrowserLocation: typeof import('@vueuse/core')['useBrowserLocation']
const useCached: typeof import('@vueuse/core')['useCached'] const useCached: typeof import('@vueuse/core')['useCached']
const useClipboard: typeof import('@vueuse/core')['useClipboard'] const useClipboard: typeof import('@vueuse/core')['useClipboard']
const useClipboardItems: typeof import('@vueuse/core')['useClipboardItems']
const useCloned: typeof import('@vueuse/core')['useCloned'] const useCloned: typeof import('@vueuse/core')['useCloned']
const useColorMode: typeof import('@vueuse/core')['useColorMode'] const useColorMode: typeof import('@vueuse/core')['useColorMode']
const useConfirmDialog: typeof import('@vueuse/core')['useConfirmDialog'] const useConfirmDialog: typeof import('@vueuse/core')['useConfirmDialog']
......
差异被折叠。
...@@ -20,25 +20,25 @@ ...@@ -20,25 +20,25 @@
"@tinymce/tinymce-vue": "^5.0.1", "@tinymce/tinymce-vue": "^5.0.1",
"@vue-flow/controls": "^1.0.4", "@vue-flow/controls": "^1.0.4",
"@vue-flow/core": "^1.17.4", "@vue-flow/core": "^1.17.4",
"@vueuse/core": "^10.3.0", "@vueuse/core": "^10.9.0",
"axios": "^1.5.0", "axios": "^1.6.8",
"blueimp-md5": "^2.19.0", "blueimp-md5": "^2.19.0",
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"echarts": "^5.4.3", "echarts": "^5.5.0",
"echarts-wordcloud": "^2.1.0", "echarts-wordcloud": "^2.1.0",
"element-plus": "^2.7.0", "element-plus": "^2.6.3",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"nanoid": "^4.0.2", "nanoid": "^5.0.7",
"pinia": "^2.1.6", "pinia": "^2.1.7",
"vue": "^3.4.23", "vue": "^3.4.23",
"vue-echarts": "^6.6.1", "vue-echarts": "^6.6.9",
"vue-router": "^4.3.1", "vue-router": "^4.3.2",
"xss": "^1.0.15" "xss": "^1.0.15"
}, },
"devDependencies": { "devDependencies": {
"@rushstack/eslint-patch": "^1.2.0", "@rushstack/eslint-patch": "^1.2.0",
"@tsconfig/node20": "^20.1.4", "@tsconfig/node20": "^20.1.4",
"@types/blueimp-md5": "^2.18.0", "@types/blueimp-md5": "^2.18.2",
"@types/node": "^20.3.1", "@types/node": "^20.3.1",
"@vitejs/plugin-vue": "^4.6.2", "@vitejs/plugin-vue": "^4.6.2",
"@vue-macros/reactivity-transform": "^0.4.4", "@vue-macros/reactivity-transform": "^0.4.4",
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
"eslint-plugin-vue": "^9.17.0", "eslint-plugin-vue": "^9.17.0",
"sass": "^1.67.0", "sass": "^1.67.0",
"typescript": "~5.4.5", "typescript": "~5.4.5",
"unplugin-auto-import": "^0.16.7", "unplugin-auto-import": "^0.17.5",
"vite": "^4.5.3", "vite": "^4.5.3",
"vue-tsc": "^1.8.27" "vue-tsc": "^1.8.27"
} }
......
...@@ -81,13 +81,13 @@ textarea:focus { ...@@ -81,13 +81,13 @@ textarea:focus {
--main-success-color: #00ac27; --main-success-color: #00ac27;
} }
.el-dialog__header { .el-dialog__header {
margin-right: 0 !important;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
margin: 0 -16px 30px;
padding: 0 16px;
} }
.info .el-form-item { .info .el-form-item {
margin-bottom: 0; margin-bottom: 0;
} }
.info tr:last-child td { .info tr:last-child td {
padding-bottom: 0 !important; padding-bottom: 0 !important;
} }
...@@ -58,9 +58,9 @@ function handleSubmit() { ...@@ -58,9 +58,9 @@ function handleSubmit() {
<el-table-column label="属性生成规则" align="center" width="400"> <el-table-column label="属性生成规则" align="center" width="400">
<template #default="{ row }"> <template #default="{ row }">
<el-radio-group v-model="row.form.mode"> <el-radio-group v-model="row.form.mode">
<el-radio :label="1">随机值</el-radio> <el-radio :value="1">随机值</el-radio>
<el-radio :label="2">固定值</el-radio> <el-radio :value="2">固定值</el-radio>
<el-radio :label="3">历史随机值</el-radio> <el-radio :value="3">历史随机值</el-radio>
</el-radio-group> </el-radio-group>
<div class="rule-box"> <div class="rule-box">
<!-- 字符串 --> <!-- 字符串 -->
...@@ -68,8 +68,8 @@ function handleSubmit() { ...@@ -68,8 +68,8 @@ function handleSubmit() {
<!-- 随机值 --> <!-- 随机值 -->
<template v-if="row.form.mode === 1"> <template v-if="row.form.mode === 1">
<el-radio-group v-model="row.form.rule.type"> <el-radio-group v-model="row.form.rule.type">
<el-radio :label="1">来自于系统数据</el-radio> <el-radio :value="1">来自于系统数据</el-radio>
<el-radio :label="4">完全随机</el-radio> <el-radio :value="4">完全随机</el-radio>
</el-radio-group> </el-radio-group>
</template> </template>
<!-- 固定值 --> <!-- 固定值 -->
...@@ -81,8 +81,10 @@ function handleSubmit() { ...@@ -81,8 +81,10 @@ function handleSubmit() {
<template v-if="row.type === '2' || row.type === '3'"> <template v-if="row.type === '2' || row.type === '3'">
<!-- 随机值 --> <!-- 随机值 -->
<template v-if="row.form.mode === 1"> <template v-if="row.form.mode === 1">
Min<el-input-number :controls="false" size="small" v-model="row.form.rule.num_min" /> Min<el-input-number :controls="false" size="small" v-model="row.form.rule.num_min" /> Max<el-input-number
Max<el-input-number :controls="false" size="small" v-model="row.form.rule.num_max" /> :controls="false"
size="small"
v-model="row.form.rule.num_max" />
</template> </template>
<!-- 固定值 --> <!-- 固定值 -->
<template v-if="row.form.mode === 2"> <template v-if="row.form.mode === 2">
...@@ -94,31 +96,17 @@ function handleSubmit() { ...@@ -94,31 +96,17 @@ function handleSubmit() {
<!-- 随机值 --> <!-- 随机值 -->
<template v-if="row.form.mode === 1"> <template v-if="row.form.mode === 1">
<el-radio-group v-model="row.form.rule.date_type"> <el-radio-group v-model="row.form.rule.date_type">
<el-radio :label="1">完全随机(不早于当前时间)</el-radio> <el-radio :value="1">完全随机(不早于当前时间)</el-radio>
<el-radio :label="2"> <el-radio :value="2">
时间区间&nbsp;<el-date-picker 时间区间&nbsp;<el-date-picker size="small" value-format="YYYY-MM-DD" v-model="row.form.rule.date_start" style="width: 120px" />
size="small"
value-format="YYYY-MM-DD"
v-model="row.form.rule.date_start"
style="width: 120px" />
&nbsp;&nbsp; &nbsp;&nbsp;
<el-date-picker <el-date-picker size="small" value-format="YYYY-MM-DD" v-model="row.form.rule.date_end" style="width: 120px" />
size="small"
value-format="YYYY-MM-DD"
v-model="row.form.rule.date_end"
style="width: 120px" />
</el-radio> </el-radio>
<el-radio :label="3"> <el-radio :value="3">
当前时间前&nbsp;<el-input-number 当前时间前&nbsp;<el-input-number :controls="false" size="small" v-model="row.form.rule.date_current_before" />&nbsp;
:controls="false"
size="small"
v-model="row.form.rule.date_current_before" />&nbsp;
</el-radio> </el-radio>
<el-radio :label="4"> <el-radio :value="4">
当前时间后&nbsp;<el-input-number 当前时间后&nbsp;<el-input-number :controls="false" size="small" v-model="row.form.rule.date_current_after" />&nbsp;
:controls="false"
size="small"
v-model="row.form.rule.date_current_after" />&nbsp;
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</template> </template>
......
...@@ -57,8 +57,8 @@ function onSaveEventRule(rules: []) { ...@@ -57,8 +57,8 @@ function onSaveEventRule(rules: []) {
<template #step-body-after> <template #step-body-after>
<el-row justify="center" style="margin-bottom: 20px"> <el-row justify="center" style="margin-bottom: 20px">
<el-radio-group v-model="radio" size="large"> <el-radio-group v-model="radio" size="large">
<el-radio-button label="1">判断事件数据</el-radio-button> <el-radio-button value="1">判断事件数据</el-radio-button>
<el-radio-button label="2">生成事件数据</el-radio-button> <el-radio-button value="2">生成事件数据</el-radio-button>
</el-radio-group> </el-radio-group>
</el-row> </el-row>
</template> </template>
...@@ -70,13 +70,13 @@ function onSaveEventRule(rules: []) { ...@@ -70,13 +70,13 @@ function onSaveEventRule(rules: []) {
</p> </p>
<el-form-item label="生成规则"> <el-form-item label="生成规则">
<el-radio-group :model-value="1"> <el-radio-group :model-value="1">
<el-radio :label="1">随机</el-radio> <el-radio :value="1">随机</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="生成方式"> <el-form-item label="生成方式">
<el-radio-group v-model="form.data_rule.generate_way"> <el-radio-group v-model="form.data_rule.generate_way">
<el-radio :label="1">百分比</el-radio> <el-radio :value="1">百分比</el-radio>
<el-radio :label="2">数值</el-radio> <el-radio :value="2">数值</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="请输入分支条件数值"></el-form-item> <el-form-item label="请输入分支条件数值"></el-form-item>
...@@ -98,20 +98,12 @@ function onSaveEventRule(rules: []) { ...@@ -98,20 +98,12 @@ function onSaveEventRule(rules: []) {
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Min"> <el-form-item label="Min">
<el-input-number <el-input-number v-model="form.data_rule.event_count_min" :controls="false" :max="3" style="width: 80px" />
v-model="form.data_rule.event_count_min"
:controls="false"
:max="3"
style="width: 80px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Max"> <el-form-item label="Max">
<el-input-number <el-input-number v-model="form.data_rule.event_count_max" :controls="false" :max="5" style="width: 80px" />
v-model="form.data_rule.event_count_max"
:controls="false"
:max="5"
style="width: 80px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -127,13 +119,13 @@ function onSaveEventRule(rules: []) { ...@@ -127,13 +119,13 @@ function onSaveEventRule(rules: []) {
<el-form-item label="生成规则"> <el-form-item label="生成规则">
<el-radio-group :model-value="1"> <el-radio-group :model-value="1">
<el-radio :label="1">随机</el-radio> <el-radio :value="1">随机</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="生成方式"> <el-form-item label="生成方式">
<el-radio-group v-model="form.data_rule.generate_way"> <el-radio-group v-model="form.data_rule.generate_way">
<el-radio :label="1">百分比</el-radio> <el-radio :value="1">百分比</el-radio>
<el-radio :label="2">数值</el-radio> <el-radio :value="2">数值</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="请输入分支条件数值"></el-form-item> <el-form-item label="请输入分支条件数值"></el-form-item>
...@@ -155,20 +147,12 @@ function onSaveEventRule(rules: []) { ...@@ -155,20 +147,12 @@ function onSaveEventRule(rules: []) {
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Min"> <el-form-item label="Min">
<el-input-number <el-input-number v-model="form.data_rule.event_count_min" :controls="false" :max="3" style="width: 80px" />
v-model="form.data_rule.event_count_min"
:controls="false"
:max="3"
style="width: 80px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Max"> <el-form-item label="Max">
<el-input-number <el-input-number v-model="form.data_rule.event_count_max" :controls="false" :max="5" style="width: 80px" />
v-model="form.data_rule.event_count_max"
:controls="false"
:max="5"
style="width: 80px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -198,10 +182,5 @@ function onSaveEventRule(rules: []) { ...@@ -198,10 +182,5 @@ function onSaveEventRule(rules: []) {
</section> </section>
</template> </template>
</RuleTemplate> </RuleTemplate>
<Generate <Generate :node="node" :rules="form.event_attr_rule" v-model="generateVisible" @save="onSaveEventRule" v-if="generateVisible"></Generate>
:node="node"
:rules="form.event_attr_rule"
v-model="generateVisible"
@save="onSaveEventRule"
v-if="generateVisible"></Generate>
</template> </template>
...@@ -27,8 +27,8 @@ watchEffect(() => { ...@@ -27,8 +27,8 @@ watchEffect(() => {
<ConfigTemplate :model="form" :node="node"> <ConfigTemplate :model="form" :node="node">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.in_group"> <el-radio-group v-model="form.in_group">
<el-radio label="0">在群组中</el-radio> <el-radio value="0">在群组中</el-radio>
<el-radio label="1">不在群组中</el-radio> <el-radio value="1">不在群组中</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
......
...@@ -35,7 +35,7 @@ watchEffect(() => { ...@@ -35,7 +35,7 @@ watchEffect(() => {
<el-form-item> <el-form-item>
<template v-if="step === 0"> <template v-if="step === 0">
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value" style="width: 105px"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value" style="width: 105px">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -44,7 +44,7 @@ watchEffect(() => { ...@@ -44,7 +44,7 @@ watchEffect(() => {
<ConfigTemplate :model="form" :node="node"> <ConfigTemplate :model="form" :node="node">
<el-form-item label="时间判断类型"> <el-form-item label="时间判断类型">
<el-radio-group v-model="form.date_type"> <el-radio-group v-model="form.date_type">
<el-radio v-for="item in dateTypeList" :key="item.value" :label="item.value">{{ item.label }}</el-radio> <el-radio v-for="item in dateTypeList" :key="item.value" :value="item.value">{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="进入该步骤的时间"> <el-form-item label="进入该步骤的时间">
...@@ -69,7 +69,7 @@ watchEffect(() => { ...@@ -69,7 +69,7 @@ watchEffect(() => {
</template> </template>
<template v-else> <template v-else>
<el-checkbox-group v-model="form.week"> <el-checkbox-group v-model="form.week">
<el-checkbox v-for="item in weekList" :key="item" :label="item" /> <el-checkbox v-for="item in weekList" :key="item" :value="item" />
</el-checkbox-group> </el-checkbox-group>
</template> </template>
</el-form-item> </el-form-item>
......
...@@ -37,32 +37,19 @@ watchEffect(() => { ...@@ -37,32 +37,19 @@ watchEffect(() => {
<ConfigTemplate :model="form" :node="node"> <ConfigTemplate :model="form" :node="node">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.time_type" style="display: block"> <el-radio-group v-model="form.time_type" style="display: block">
<el-radio label="0" size="large" style="display: block"> <el-radio value="0" size="large" style="display: block">
<span>延时 </span> <span>延时 </span>
<el-input <el-input :disabled="form.time_type !== '0'" v-model="form.time_num" placeholder="请输入" class="input-with-select">
:disabled="form.time_type !== '0'"
v-model="form.time_num"
placeholder="请输入"
class="input-with-select">
<template #append> <template #append>
<el-select <el-select v-model="form.time_unit" placeholder="请选择" style="width: 115px" :disabled="form.time_type !== '0'">
v-model="form.time_unit"
placeholder="请选择"
style="width: 115px"
:disabled="form.time_type !== '0'">
<el-option v-for="item in timeUnitList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in timeUnitList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</template> </template>
</el-input> </el-input>
</el-radio> </el-radio>
<el-radio label="1" size="large" style="display: block"> <el-radio value="1" size="large" style="display: block">
<span>延时至 </span> <span>延时至 </span>
<el-date-picker <el-date-picker :disabled="form.time_type !== '1'" v-model="form.time" type="datetime" placeholder="请选择" value-format="YYYY-MM-DD HH:mm:ss" />
:disabled="form.time_type !== '1'"
v-model="form.time"
type="datetime"
placeholder="请选择"
value-format="YYYY-MM-DD HH:mm:ss" />
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
......
...@@ -35,7 +35,7 @@ const { connectionList } = useConnection(2) ...@@ -35,7 +35,7 @@ const { connectionList } = useConnection(2)
<template v-if="step === 0"> <template v-if="step === 0">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
...@@ -51,7 +51,7 @@ const { connectionList } = useConnection(2) ...@@ -51,7 +51,7 @@ const { connectionList } = useConnection(2)
<template v-else-if="step === 2"> <template v-else-if="step === 2">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.material_type" @change="form.material_id = ''"> <el-radio-group v-model="form.material_type" @change="form.material_id = ''">
<el-radio v-for="item in materialTypeList" :key="item.id" :label="item.value" style="width: 105px"> <el-radio v-for="item in materialTypeList" :key="item.id" :value="item.value" style="width: 105px">
发送{{ item.label }} 发送{{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -39,7 +39,7 @@ const { connectionList } = useConnection(6) ...@@ -39,7 +39,7 @@ const { connectionList } = useConnection(6)
<template v-if="step === 0"> <template v-if="step === 0">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
...@@ -55,7 +55,7 @@ const { connectionList } = useConnection(6) ...@@ -55,7 +55,7 @@ const { connectionList } = useConnection(6)
<template v-else-if="step === 2"> <template v-else-if="step === 2">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.material_type" @change="form.material_id = ''"> <el-radio-group v-model="form.material_type" @change="form.material_id = ''">
<el-radio v-for="item in materialTypeList" :key="item.id" :label="item.value" style="width: 105px"> <el-radio v-for="item in materialTypeList" :key="item.id" :value="item.value" style="width: 105px">
发送{{ item.label }} 发送{{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -34,7 +34,7 @@ const { connectionList } = useConnection(9) ...@@ -34,7 +34,7 @@ const { connectionList } = useConnection(9)
<template v-if="step === 0"> <template v-if="step === 0">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
...@@ -50,7 +50,7 @@ const { connectionList } = useConnection(9) ...@@ -50,7 +50,7 @@ const { connectionList } = useConnection(9)
<template v-else-if="step === 2"> <template v-else-if="step === 2">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.material_type" @change="form.material_id = ''"> <el-radio-group v-model="form.material_type" @change="form.material_id = ''">
<el-radio v-for="item in materialTypeList" :key="item.id" :label="item.value" style="width: 105px"> <el-radio v-for="item in materialTypeList" :key="item.id" :value="item.value" style="width: 105px">
发送{{ item.label }} 发送{{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -32,7 +32,7 @@ const { connectionList } = useConnection(1) ...@@ -32,7 +32,7 @@ const { connectionList } = useConnection(1)
<template v-if="step === 0"> <template v-if="step === 0">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.material_type" @change="form.material_id = ''"> <el-radio-group v-model="form.material_type" @change="form.material_id = ''">
<el-radio v-for="item in materialTypeList" :key="item.id" :label="item.value" style="width: 105px"> <el-radio v-for="item in materialTypeList" :key="item.id" :value="item.value" style="width: 105px">
发送{{ item.label }} 发送{{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -26,7 +26,7 @@ const { connectionList } = useConnection(10) ...@@ -26,7 +26,7 @@ const { connectionList } = useConnection(10)
<template v-if="step === 0"> <template v-if="step === 0">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -38,7 +38,7 @@ const { connectionList } = useConnection(7) ...@@ -38,7 +38,7 @@ const { connectionList } = useConnection(7)
<template v-if="step === 0"> <template v-if="step === 0">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
...@@ -54,7 +54,7 @@ const { connectionList } = useConnection(7) ...@@ -54,7 +54,7 @@ const { connectionList } = useConnection(7)
<template v-else-if="step === 2"> <template v-else-if="step === 2">
<el-form-item> <el-form-item>
<el-radio-group v-model="form.material_type" @change="form.material_id = ''"> <el-radio-group v-model="form.material_type" @change="form.material_id = ''">
<el-radio v-for="item in materialTypeList" :key="item.id" :label="item.value" style="width: 105px"> <el-radio v-for="item in materialTypeList" :key="item.id" :value="item.value" style="width: 105px">
发送{{ item.label }} 发送{{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -31,7 +31,7 @@ const operateList = ref([ ...@@ -31,7 +31,7 @@ const operateList = ref([
<el-form-item> <el-form-item>
<template v-if="step === 0"> <template v-if="step === 0">
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value" style="width: 105px"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value" style="width: 105px">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -31,7 +31,7 @@ const operateList = ref([ ...@@ -31,7 +31,7 @@ const operateList = ref([
<el-form-item> <el-form-item>
<template v-if="step === 0"> <template v-if="step === 0">
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value" style="width: 140px"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value" style="width: 140px">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -37,7 +37,7 @@ const operateList = ref([ ...@@ -37,7 +37,7 @@ const operateList = ref([
<el-form-item> <el-form-item>
<template v-if="step === 0"> <template v-if="step === 0">
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value" style="width: 105px"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value" style="width: 105px">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -19,9 +19,9 @@ watchEffect(() => { ...@@ -19,9 +19,9 @@ watchEffect(() => {
<ConfigTemplate :model="form" :node="node"> <ConfigTemplate :model="form" :node="node">
<el-form-item label="触发类型" prop="trigger_type"> <el-form-item label="触发类型" prop="trigger_type">
<el-radio-group v-model="form.trigger_type"> <el-radio-group v-model="form.trigger_type">
<el-radio label="0">单次触发</el-radio> <el-radio value="0">单次触发</el-radio>
<el-radio label="1">重复触发</el-radio> <el-radio value="1">重复触发</el-radio>
<el-radio label="2">立即触发</el-radio> <el-radio value="2">立即触发</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<template v-if="form.trigger_type === '0'"> <template v-if="form.trigger_type === '0'">
......
...@@ -29,7 +29,7 @@ const operateList = ref([ ...@@ -29,7 +29,7 @@ const operateList = ref([
<el-form-item> <el-form-item>
<template v-if="step === 0"> <template v-if="step === 0">
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value" style="width: 130px"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value" style="width: 130px">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -26,7 +26,7 @@ const operateList = ref([{ label: '提交表单', value: '0' }]) ...@@ -26,7 +26,7 @@ const operateList = ref([{ label: '提交表单', value: '0' }])
<el-form-item> <el-form-item>
<template v-if="step === 0"> <template v-if="step === 0">
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value" style="width: 130px"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value" style="width: 130px">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -26,7 +26,7 @@ const operateList = ref([{ label: '新用户注册', value: '0' }]) ...@@ -26,7 +26,7 @@ const operateList = ref([{ label: '新用户注册', value: '0' }])
<el-form-item> <el-form-item>
<template v-if="step === 0"> <template v-if="step === 0">
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value" style="width: 130px"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value" style="width: 130px">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -33,7 +33,7 @@ const operateList = ref([ ...@@ -33,7 +33,7 @@ const operateList = ref([
<el-form-item> <el-form-item>
<template v-if="step === 0"> <template v-if="step === 0">
<el-radio-group v-model="form.operate" v-if="step === 0"> <el-radio-group v-model="form.operate" v-if="step === 0">
<el-radio v-for="item in operateList" :key="item.value" :label="item.value" style="width: 130px"> <el-radio v-for="item in operateList" :key="item.value" :value="item.value" style="width: 130px">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -81,8 +81,8 @@ function handleAttrChange(value: any) { ...@@ -81,8 +81,8 @@ function handleAttrChange(value: any) {
<div class="rfm-header"> <div class="rfm-header">
<p style="margin-right: 20px">{{ label }}值计算依据</p> <p style="margin-right: 20px">{{ label }}值计算依据</p>
<el-radio-group v-model="form.basis" @change="handleBasisChange"> <el-radio-group v-model="form.basis" @change="handleBasisChange">
<el-radio label="1">用户属性</el-radio> <el-radio value="1">用户属性</el-radio>
<el-radio label="2">事件属性</el-radio> <el-radio value="2">事件属性</el-radio>
</el-radio-group> </el-radio-group>
<p style="margin-left: 10px">计算规则:</p> <p style="margin-left: 10px">计算规则:</p>
<el-select v-model="form.rule" style="width: 170px" @change="handleRuleChange"> <el-select v-model="form.rule" style="width: 170px" @change="handleRuleChange">
......
...@@ -192,7 +192,7 @@ const eventTimeOption = computed(() => { ...@@ -192,7 +192,7 @@ const eventTimeOption = computed(() => {
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-checkbox-group v-model="eventValues"> <el-checkbox-group v-model="eventValues">
<el-checkbox v-for="item in eventList" :key="item.id" :label="item.id">{{ item.name }}</el-checkbox> <el-checkbox v-for="item in eventList" :key="item.id" :value="item.id">{{ item.name }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
...@@ -134,7 +134,7 @@ const options = computed(() => { ...@@ -134,7 +134,7 @@ const options = computed(() => {
<ChartCard :options="options" :loading="loading"> <ChartCard :options="options" :loading="loading">
<template #title> <template #title>
<el-row justify="space-between" style="flex: 1"> <el-row justify="space-between" style="flex: 1">
<el-select v-model="metaAttrValue" filterable> <el-select v-model="metaAttrValue" filterable style="width: 200px">
<el-option v-for="item in metaAttrList" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in metaAttrList" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
<el-select v-model="chartType" style="width: 86px"> <el-select v-model="chartType" style="width: 86px">
......
...@@ -136,8 +136,8 @@ const option = computed(() => { ...@@ -136,8 +136,8 @@ const option = computed(() => {
</el-form-item> </el-form-item>
<el-form-item label="请选择数据覆盖形式" :rules="rules"> <el-form-item label="请选择数据覆盖形式" :rules="rules">
<el-radio-group v-model="ruleForm.cover_type"> <el-radio-group v-model="ruleForm.cover_type">
<el-radio :label="1">全新覆盖</el-radio> <el-radio :value="1">全新覆盖</el-radio>
<el-radio :label="2">追加</el-radio> <el-radio :value="2">追加</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="事件发生时间" :rules="rules"> <el-form-item label="事件发生时间" :rules="rules">
......
...@@ -38,14 +38,10 @@ const remove = function (item: any, index: number) { ...@@ -38,14 +38,10 @@ const remove = function (item: any, index: number) {
<el-form-item v-for="item in props.data" :label="item.name"> <el-form-item v-for="item in props.data" :label="item.name">
<div> <div>
<el-radio-group v-model="item.rule.type"> <el-radio-group v-model="item.rule.type">
<el-radio :label="2">指定随机</el-radio> <el-radio :value="2">指定随机</el-radio>
<el-radio :label="1">固定</el-radio> <el-radio :value="1">固定</el-radio>
</el-radio-group> </el-radio-group>
<p class="specify-tips"> <p class="specify-tips">字段类型:{{ fieldsType[item.type] }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ ruleTips[item.type] }}{{ item.format }}</p>
字段类型:{{ fieldsType[item.type] }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ ruleTips[item.type] }}{{
item.format
}}
</p>
<div class="specify" v-if="item.rule.type === 2"> <div class="specify" v-if="item.rule.type === 2">
<div class="specify-item" v-for="(specify, index) in item.rule.rand_value"> <div class="specify-item" v-for="(specify, index) in item.rule.rand_value">
<!-- 字符串 --> <!-- 字符串 -->
...@@ -66,34 +62,17 @@ const remove = function (item: any, index: number) { ...@@ -66,34 +62,17 @@ const remove = function (item: any, index: number) {
</template> </template>
<!-- 日期 --> <!-- 日期 -->
<template v-if="parseInt(item.type) === 4"> <template v-if="parseInt(item.type) === 4">
<el-date-picker <el-date-picker placeholder="请选择随机日期最小值" style="width: 200px" value-format="YYYY-MM-DD" v-model="specify.min" />
placeholder="请选择随机日期最小值" <el-date-picker placeholder="请选择随机日期最大值" style="width: 200px; margin-left: 15px" value-format="YYYY-MM-DD" v-model="specify.max" />
style="width: 200px"
value-format="YYYY-MM-DD"
v-model="specify.min"
/>
<el-date-picker
placeholder="请选择随机日期最大值"
style="width: 200px; margin-left: 15px"
value-format="YYYY-MM-DD"
v-model="specify.max"
/>
</template> </template>
<template v-if="parseInt(item.type) === 5"> <template v-if="parseInt(item.type) === 5">
<el-date-picker <el-date-picker placeholder="请选择随机时间最小值" v-model="specify.min" style="width: 200px" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" />
placeholder="请选择随机时间最小值"
v-model="specify.min"
style="width: 200px"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
/>
<el-date-picker <el-date-picker
placeholder="请选择随机时间最大值" placeholder="请选择随机时间最大值"
v-model="specify.max" v-model="specify.max"
style="width: 200px; margin-left: 15px" style="width: 200px; margin-left: 15px"
type="datetime" type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
/>
</template> </template>
<template v-if="userStore.role?.id !== 1"> <template v-if="userStore.role?.id !== 1">
<el-icon <el-icon
...@@ -103,11 +82,7 @@ const remove = function (item: any, index: number) { ...@@ -103,11 +82,7 @@ const remove = function (item: any, index: number) {
style="margin-left: 10px; cursor: pointer" style="margin-left: 10px; cursor: pointer"
><CirclePlusFilled ><CirclePlusFilled
/></el-icon> /></el-icon>
<el-icon <el-icon @click="remove(item.rule.rand_value, index)" size="20" style="margin-left: 10px; cursor: pointer" v-if="item.rule.rand_value.length > 1"
@click="remove(item.rule.rand_value, index)"
size="20"
style="margin-left: 10px; cursor: pointer"
v-if="item.rule.rand_value.length > 1"
><RemoveFilled ><RemoveFilled
/></el-icon> /></el-icon>
</template> </template>
...@@ -122,12 +97,7 @@ const remove = function (item: any, index: number) { ...@@ -122,12 +97,7 @@ const remove = function (item: any, index: number) {
</div> </div>
<div v-else> <div v-else>
<template v-if="parseInt(item.type) === 4"> <template v-if="parseInt(item.type) === 4">
<el-date-picker <el-date-picker placeholder="请选择固定属性值" style="width: 200px" value-format="YYYY-MM-DD" v-model="item.rule.fixed_value" />
placeholder="请选择固定属性值"
style="width: 200px"
value-format="YYYY-MM-DD"
v-model="item.rule.fixed_value"
/>
</template> </template>
<template v-else-if="parseInt(item.type) === 5"> <template v-else-if="parseInt(item.type) === 5">
<el-date-picker <el-date-picker
...@@ -135,8 +105,7 @@ const remove = function (item: any, index: number) { ...@@ -135,8 +105,7 @@ const remove = function (item: any, index: number) {
v-model="item.rule.fixed_value" v-model="item.rule.fixed_value"
style="width: 200px" style="width: 200px"
type="datetime" type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
/>
</template> </template>
<template v-else> <template v-else>
<el-input v-model="item.rule.fixed_value" placeholder="请输入固定属性值"></el-input> <el-input v-model="item.rule.fixed_value" placeholder="请输入固定属性值"></el-input>
......
...@@ -114,9 +114,9 @@ const sendChat = function () { ...@@ -114,9 +114,9 @@ const sendChat = function () {
<p style="color: #ccc; font-size: 12px; text-align: center; margin-bottom: 20px">注:填写信息保存之后,关注成功</p> <p style="color: #ccc; font-size: 12px; text-align: center; margin-bottom: 20px">注:填写信息保存之后,关注成功</p>
<el-form-item label="性别" prop="gender"> <el-form-item label="性别" prop="gender">
<el-radio-group v-model="ruleForm.gender"> <el-radio-group v-model="ruleForm.gender">
<el-radio label="1"></el-radio> <el-radio value="1"></el-radio>
<el-radio label="2"></el-radio> <el-radio value="2"></el-radio>
<el-radio label="0">未知</el-radio> <el-radio value="0">未知</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号" prop="mobile">
......
...@@ -89,16 +89,16 @@ const rules = [{ required: true }] ...@@ -89,16 +89,16 @@ const rules = [{ required: true }]
<el-form :disabled="userStore.role?.id === 1" label-suffix=":" ref="ruleFormRef" :model="ruleForm" label-width="auto" class="demo-ruleForm" status-icon> <el-form :disabled="userStore.role?.id === 1" label-suffix=":" ref="ruleFormRef" :model="ruleForm" label-width="auto" class="demo-ruleForm" status-icon>
<el-form-item label="请输入需要生成的数据量" :rules="rules"> <el-form-item label="请输入需要生成的数据量" :rules="rules">
<el-radio-group v-model="ruleForm.size"> <el-radio-group v-model="ruleForm.size">
<el-radio :label="1000">1000</el-radio> <el-radio :value="1000">1000</el-radio>
<el-radio :label="3000">3000</el-radio> <el-radio :value="3000">3000</el-radio>
<el-radio :label="5000">5000</el-radio> <el-radio :value="5000">5000</el-radio>
<el-radio :label="10000">10000</el-radio> <el-radio :value="10000">10000</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="请选择数据覆盖形式:" :rules="rules"> <el-form-item label="请选择数据覆盖形式:" :rules="rules">
<el-radio-group v-model="ruleForm.cover_type"> <el-radio-group v-model="ruleForm.cover_type">
<el-radio :label="1">全新覆盖</el-radio> <el-radio :value="1">全新覆盖</el-radio>
<el-radio :label="2">去重追加</el-radio> <el-radio :value="2">去重追加</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-divider /> <el-divider />
...@@ -107,8 +107,8 @@ const rules = [{ required: true }] ...@@ -107,8 +107,8 @@ const rules = [{ required: true }]
</el-form-item> </el-form-item>
<el-form-item label="姓名" :rules="rules"> <el-form-item label="姓名" :rules="rules">
<el-radio-group v-model="ruleForm.name"> <el-radio-group v-model="ruleForm.name">
<el-radio :label="1">随机</el-radio> <el-radio :value="1">随机</el-radio>
<el-radio :label="2">固定</el-radio> <el-radio :value="2">固定</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="ruleForm.name === 2" label="固定姓名" :rules="rules"> <el-form-item v-if="ruleForm.name === 2" label="固定姓名" :rules="rules">
...@@ -116,20 +116,20 @@ const rules = [{ required: true }] ...@@ -116,20 +116,20 @@ const rules = [{ required: true }]
</el-form-item> </el-form-item>
<el-form-item label="状态" :rules="rules"> <el-form-item label="状态" :rules="rules">
<el-radio-group v-model="ruleForm.status"> <el-radio-group v-model="ruleForm.status">
<el-radio :label="1">生效</el-radio> <el-radio :value="1">生效</el-radio>
<el-radio :label="2">失效</el-radio> <el-radio :value="2">失效</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="性别" :rules="rules"> <el-form-item label="性别" :rules="rules">
<el-radio-group v-model="ruleForm.gender"> <el-radio-group v-model="ruleForm.gender">
<el-radio :label="1">随机</el-radio> <el-radio :value="1">随机</el-radio>
<el-radio :label="2"></el-radio> <el-radio :value="2"></el-radio>
<el-radio :label="3"></el-radio> <el-radio :value="3"></el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="手机号吗" :rules="rules"> <el-form-item label="手机号吗" :rules="rules">
<el-radio-group v-model="ruleForm.mobile"> <el-radio-group v-model="ruleForm.mobile">
<el-radio :label="1">随机</el-radio> <el-radio :value="1">随机</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<OtherFields :data="props.data?.other_fields || []"></OtherFields> <OtherFields :data="props.data?.other_fields || []"></OtherFields>
......
...@@ -161,7 +161,7 @@ async function handleUpdate() { ...@@ -161,7 +161,7 @@ async function handleUpdate() {
<template v-if="data.type === '2'"> <template v-if="data.type === '2'">
<el-form-item label="更新频率" prop="update_status"> <el-form-item label="更新频率" prop="update_status">
<el-radio-group v-model="form.update_status"> <el-radio-group v-model="form.update_status">
<el-radio v-for="item in updateStatusRuleList" :key="item.value" :label="item.value" :disabled="item.value === '1'"> <el-radio v-for="item in updateStatusRuleList" :key="item.value" :value="item.value" :disabled="item.value === '1'">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -92,7 +92,7 @@ function handleUpdate() { ...@@ -92,7 +92,7 @@ function handleUpdate() {
</el-form-item> </el-form-item>
<el-form-item label="更新频率" prop="update_status"> <el-form-item label="更新频率" prop="update_status">
<el-radio-group v-model="form.update_status"> <el-radio-group v-model="form.update_status">
<el-radio v-for="item in updateStatusRuleList" :key="item.value" :label="item.value" :disabled="item.value === '1'"> <el-radio v-for="item in updateStatusRuleList" :key="item.value" :value="item.value" :disabled="item.value === '1'">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -40,7 +40,7 @@ async function handleNext() { ...@@ -40,7 +40,7 @@ async function handleNext() {
<el-form label-suffix=":" label-width="130" :model="form" :rules="rules" ref="formRef" :disabled="action === 'view'"> <el-form label-suffix=":" label-width="130" :model="form" :rules="rules" ref="formRef" :disabled="action === 'view'">
<el-form-item label="营销内容类型" prop="type"> <el-form-item label="营销内容类型" prop="type">
<el-radio-group v-model="form.type" :disabled="action === 'update'"> <el-radio-group v-model="form.type" :disabled="action === 'update'">
<el-radio v-for="item in materialType" :key="item.id" :label="item.value">{{ item.label }}</el-radio> <el-radio v-for="item in materialType" :key="item.id" :value="item.value">{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="内容名称" prop="name"> <el-form-item label="内容名称" prop="name">
...@@ -48,7 +48,7 @@ async function handleNext() { ...@@ -48,7 +48,7 @@ async function handleNext() {
</el-form-item> </el-form-item>
<el-form-item label="创作方式" prop="way"> <el-form-item label="创作方式" prop="way">
<el-radio-group v-model="form.way"> <el-radio-group v-model="form.way">
<el-radio v-for="item in materialMethodList" :key="item.value" :label="item.value" :disabled="item.value == 1 && form.type != 1">{{ <el-radio v-for="item in materialMethodList" :key="item.value" :value="item.value" :disabled="item.value == 1 && form.type != 1">{{
item.label item.label
}}</el-radio> }}</el-radio>
</el-radio-group> </el-radio-group>
......
...@@ -53,17 +53,17 @@ async function handleNext() { ...@@ -53,17 +53,17 @@ async function handleNext() {
</el-form-item> </el-form-item>
<el-form-item label="使用场景" prop="scenario_type"> <el-form-item label="使用场景" prop="scenario_type">
<el-radio-group v-model="form.scenario_type"> <el-radio-group v-model="form.scenario_type">
<el-radio v-for="item in materialUsageList" :key="item.id" :label="item.value">{{ item.label }}</el-radio> <el-radio v-for="item in materialUsageList" :key="item.id" :value="item.value">{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="使用人员" prop="personnel_type"> <el-form-item label="使用人员" prop="personnel_type">
<el-radio-group v-model="form.personnel_type"> <el-radio-group v-model="form.personnel_type">
<el-radio v-for="item in materialUsersList" :key="item.id" :label="item.value">{{ item.label }}</el-radio> <el-radio v-for="item in materialUsersList" :key="item.id" :value="item.value">{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="内容投放渠道" prop="channel"> <el-form-item label="内容投放渠道" prop="channel">
<el-radio-group v-model="form.channel"> <el-radio-group v-model="form.channel">
<el-radio v-for="item in connectionList" :key="item.id" :label="item.id">{{ item.type_name }}</el-radio> <el-radio v-for="item in connectionList" :key="item.id" :value="item.id">{{ item.type_name }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="关键点" prop="key_points"> <el-form-item label="关键点" prop="key_points">
......
...@@ -32,17 +32,17 @@ const typeName = computed(() => { ...@@ -32,17 +32,17 @@ const typeName = computed(() => {
</el-form-item> </el-form-item>
<el-form-item label="使用场景" prop="scenario_type"> <el-form-item label="使用场景" prop="scenario_type">
<el-radio-group :model-value="data.scenario_type"> <el-radio-group :model-value="data.scenario_type">
<el-radio v-for="item in materialUsageList" :key="item.id" :label="item.value">{{ item.label }}</el-radio> <el-radio v-for="item in materialUsageList" :key="item.id" :value="item.value">{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="使用人员" prop="personnel_type"> <el-form-item label="使用人员" prop="personnel_type">
<el-radio-group :model-value="data.personnel_type"> <el-radio-group :model-value="data.personnel_type">
<el-radio v-for="item in materialUsersList" :key="item.id" :label="item.value">{{ item.label }}</el-radio> <el-radio v-for="item in materialUsersList" :key="item.id" :value="item.value">{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="内容投放渠道" prop="channel"> <el-form-item label="内容投放渠道" prop="channel">
<el-radio-group :model-value="data.channel"> <el-radio-group :model-value="data.channel">
<el-radio v-for="item in connectionList" :key="item.id" :label="item.id">{{ item.type_name }}</el-radio> <el-radio v-for="item in connectionList" :key="item.id" :value="item.id">{{ item.type_name }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="关键点" prop="key_points"> <el-form-item label="关键点" prop="key_points">
......
...@@ -77,11 +77,11 @@ function handleSubmit() { ...@@ -77,11 +77,11 @@ function handleSubmit() {
<el-col :span="12"> <el-col :span="12">
<el-form-item label="数据生成启动控制"> <el-form-item label="数据生成启动控制">
<el-radio-group v-model="form.data_generate_mode" style="margin-right: 40px"> <el-radio-group v-model="form.data_generate_mode" style="margin-right: 40px">
<el-radio label="1">人工启动</el-radio> <el-radio value="1">人工启动</el-radio>
<el-radio label="2">自动启动</el-radio> <el-radio value="2">自动启动</el-radio>
</el-radio-group> </el-radio-group>
<el-radio-group v-model="form.auto_generate_rule.mode" v-if="form.data_generate_mode === '2'"> <el-radio-group v-model="form.auto_generate_rule.mode" v-if="form.data_generate_mode === '2'">
<el-radio label="2"> <el-radio value="2">
<span>每隔&nbsp;&nbsp;</span> <span>每隔&nbsp;&nbsp;</span>
<el-input v-model="form.auto_generate_rule.value" style="width: 140px"> <el-input v-model="form.auto_generate_rule.value" style="width: 140px">
<template #append> <template #append>
...@@ -92,15 +92,15 @@ function handleSubmit() { ...@@ -92,15 +92,15 @@ function handleSubmit() {
</template> </template>
</el-input> </el-input>
</el-radio> </el-radio>
<el-radio label="1">学生完成旅程配置</el-radio> <el-radio value="1">学生完成旅程配置</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="数据生成停止控制"> <el-form-item label="数据生成停止控制">
<el-radio-group v-model="form.data_generate_frequency"> <el-radio-group v-model="form.data_generate_frequency">
<el-radio label="1">一次性生成</el-radio> <el-radio value="1">一次性生成</el-radio>
<el-radio label="2" disabled>覆盖生成</el-radio> <el-radio value="2" disabled>覆盖生成</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
...@@ -51,7 +51,7 @@ const bytesToSize = (bytes: number) => { ...@@ -51,7 +51,7 @@ const bytesToSize = (bytes: number) => {
class="connect-form" class="connect-form"
title="导入用户数据" title="导入用户数据"
:close-on-click-modal="false" :close-on-click-modal="false"
width="700px" width="800px"
@update:modelValue="value => $emit('update:modelValue', value)"> @update:modelValue="value => $emit('update:modelValue', value)">
<AppList v-bind="listOptions" ref="appList"></AppList> <AppList v-bind="listOptions" ref="appList"></AppList>
</el-dialog> </el-dialog>
......
...@@ -70,7 +70,6 @@ async function fetchEvent(isReset = false) { ...@@ -70,7 +70,6 @@ async function fetchEvent(isReset = false) {
} }
const { data } = await getMemberImage({ id: userId.value, connection_id: currentConnection.value, page: event.page, 'per-page': 20 }) const { data } = await getMemberImage({ id: userId.value, connection_id: currentConnection.value, page: event.page, 'per-page': 20 })
Object.assign(event, { page: event.page + 1, total: data.events.total, list: [...event.list, ...data.events.list] }) Object.assign(event, { page: event.page + 1, total: data.events.total, list: [...event.list, ...data.events.list] })
console.log(event)
} }
watch(currentConnection, () => { watch(currentConnection, () => {
fetchEvent(true) fetchEvent(true)
...@@ -165,7 +164,7 @@ watch(currentConnection, () => { ...@@ -165,7 +164,7 @@ watch(currentConnection, () => {
</AppCard> </AppCard>
<AppCard class="card" title="用户行为轨迹"> <AppCard class="card" title="用户行为轨迹">
<el-radio-group v-model="currentConnection"> <el-radio-group v-model="currentConnection">
<el-radio-button :label="item.id" v-for="item in connectionList" :key="item.id">{{ item.type_name }}</el-radio-button> <el-radio-button :value="item.id" v-for="item in connectionList" :key="item.id">{{ item.type_name }}</el-radio-button>
</el-radio-group> </el-radio-group>
<template v-if="event.list.length"> <template v-if="event.list.length">
<div class="event-box" v-for="(item, index) in event.list" :key="index"> <div class="event-box" v-for="(item, index) in event.list" :key="index">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论