jcq 1 周之前
父节点
当前提交
b5c46a241d

+ 2 - 2
.env

@@ -5,10 +5,10 @@ VITE_IS_MICRO= true
 VITE_PUBLIC_PATH = /
 
 # 后端请求前缀
-# VITE_API_URL = http://192.168.10.101:9999 
+VITE_API_URL = http://192.168.10.101:9999 
 # VITE_API_URL = http://192.168.3.118:9999
 #  VITE_API_URL = http://192.168.3.17:9999
- VITE_API_URL = http://16.162.25.197:9999
+#  VITE_API_URL = http://16.162.25.197:9999
 
 # OAUTH2 密码模式客户端信息
 VITE_OAUTH2_PASSWORD_CLIENT='pig:pig'

+ 2 - 2
src/views/count/user/versionDistribution/components/version-trend-card.vue

@@ -160,14 +160,14 @@
 					<el-button>导出</el-button>
 				</div>
 			</div>
-			<el-table v-if="showDetail && queryDate === 1" :data="tableData" border>
+			<el-table v-if="showDetail && formData?.version.length > 0 " :data="tableData" border>
 				<el-table-column prop="date" label="日期" align="center" min-width="140" />
 				<el-table-column prop="newUser" label="新增用户" align="center" min-width="140" />
 				<el-table-column prop="activeUser" label="活跃用户" align="center" min-width="140" />
 				<el-table-column prop="launch" label="启动次数" align="center" min-width="140" />
 				<el-table-column prop="upgradeUser" label="升级用户" align="center" min-width="140" />
 			</el-table>
-			<el-table v-else-if="showDetail && queryDate === 0" :data="tableData" border>
+			<el-table v-else-if="showDetail &&  formData?.version.length === 0 " :data="tableData" border>
 				<el-table-column prop="version" label="版本" align="center" min-width="140" />
 				<el-table-column prop="newUser" label="截至至今版本累计用户(%)" align="center" min-width="140" />
 				<el-table-column prop="totalUser" label="累计用户" align="center" min-width="140" />

+ 7 - 5
src/views/marketing/config/components/push.vue

@@ -56,10 +56,9 @@
 		<el-form ref="ruleFormRef" :model="formData" :rules="dataRules" label-width="90px"
 			class="flex flex-wrap mt-4 w-1/2">
 			<el-form-item label="推送应用" prop="pushApp" class="w-full">
-				<el-select v-model="formData.pushApp" placeholder="请选择推送方式" multiple collapse-tags collapse-tags-tooltip
-					:max-collapse-tags="4" filterable remote class="w-full" :value-key="'appId'">
-					<el-option v-for="item in appOptions" :key="item.value" :label="item.label"
-						:value="{ id: item.id, appId: item.value }" />
+				<el-select v-model="formData.pushApp" placeholder="请选择推送应用" multiple collapse-tags collapse-tags-tooltip
+					:max-collapse-tags="4" filterable class="w-full" :value-key="'appId'">
+					<el-option v-for="item in appOptions" :key="item.value" :label="item.label" :value="item.value" />
 				</el-select>
 			</el-form-item>
 			<el-form-item label="主动推送" prop="autoPush" class="w-1/2">
@@ -583,6 +582,10 @@ const formatNum = (value: string | number = 0) => {
 	return '';
 };
 
+onMounted(() => {
+	getAppListData();
+});
+
 watch(
 	() => props.rowData,
 	(val) => {
@@ -598,7 +601,6 @@ watch(
 			domainData.value = props.rowData.domain || [];
 			regionData.value = props.rowData.pushAddr || ['全部国家'];
 			oldUrl.value = props.rowData.pushContent;
-			getAppListData();
 		}
 	}
 );