Merge branch 'dev-jcq' of https://s-20coaj910c.zht2.com/cmy/data-marketing-platform into dev-ly

src/views/marketing/data/index.vue

@@ -118,6 +118,7 @@ const getIp = (jsonString: string) => {
 } 
 
 const getDeviceName = (jsonString: string) => {
+  if(!jsonString) return '';
   const nameMatch = jsonString.match(/"name"\s*:\s*"([^"]+)"/);
   const systemNameMatch = jsonString.match(/"systemName"\s*:\s*"([^"]+)"/);
   const name = nameMatch ? nameMatch[1] : 'unKnown';

src/views/marketing/rules/components/Edit.vue

@@ -60,8 +60,8 @@
 			<el-form ref="ruleFormRef" :model="formData" :rules="dataRules" label-width="90px"
 				class="flex flex-wrap mt-4">
 				<el-form-item label="推送方式" prop="action" class="w-1/2">
-					<JDictSelect v-model:value="formData.action" placeholder="请选择推送方式" :dictType="'pushMode'"
-						:selectFirst="true" :styleClass="'w-full'" />
+					<JDictSelect v-model:value="formData.action" placeholder="请选择推送方式" dictType="pushMode"
+						 :styleClass="'w-full'" />
 				</el-form-item>
 
 				<el-form-item label="推送频率" prop="pushFrequency" class="w-1/2">
@@ -130,19 +130,9 @@ const { t } = useI18n();
 const loading = ref(false);
 
 const ruleFormRef = ref();
-interface FormDataType {
-	ruleName: string;
-	keyword: string[];
-	ip: string[];
-	domain: string[];
-	pushContent: string;
-	pushFrequency: string;
-	action: string;
-	remark: string;
-	pushType: boolean;
-}
-
-const formData = ref<FormDataType>({
+
+
+const formData = ref<any>({
 	ruleName: '',
 	keyword: [],
 	ip: [],
@@ -486,11 +476,16 @@ watch(
 		if (val) {
 			formData.value = {
 				...props.rowData,
+				action: props.rowData?.action || '1',
 			};
 			ipData.value = props.rowData.ip || [];
 			keywordData.value = props.rowData.keyword || [];
 			domainData.value = props.rowData.domain || [];
 			oldUrl.value = props.rowData.pushContent;
+			console.log(formData.value);
+			console.log(props.rowData);
+			
+			
 		}
 	}
 );

src/views/marketing/rules/index.vue

@@ -100,6 +100,8 @@ const exportExcel = () => {
 	downBlobFile('/admin/log/export', state.queryForm, 'log.xlsx');
 };
 const openEdit = (row: any) => {
+	console.log(row);
+	
 	rowData.value = row;
 	open.value = true;
 };