|  | @@ -48,7 +48,7 @@ function Monitor(props: { onChange: () => void }) {
 | 
	
		
			
				|  |  |      const [accountIdRule, setAccountIdRule] = useState<string>('')
 | 
	
		
			
				|  |  |      const [trendColumns, setTrendColumns] = useState<string[]>(['cost'])
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    const { totalTimeUnit, planTimeUnit, adgroup, accountId, sysUserId, groupAccountIds } = queryForm
 | 
	
		
			
				|  |  | +    const { totalTimeUnit, planTimeUnit, adgroup, accountId, sysUserId, groupAccountIds, adgroupName: qfadgroupName } = queryForm
 | 
	
		
			
				|  |  |      const configName = '起量广告排行明细3.0'
 | 
	
		
			
				|  |  |      const { getGroupList, groupListInit } = useModel('useLaunchAdq.useAdAuthorize')
 | 
	
		
			
				|  |  |      const syncBatch = useAjax((params) => syncBatchApi(params))
 | 
	
	
		
			
				|  | @@ -59,7 +59,7 @@ function Monitor(props: { onChange: () => void }) {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      useEffect(() => {
 | 
	
		
			
				|  |  |          getList()
 | 
	
		
			
				|  |  | -    }, [queryForHour, filterQuery, queryForm?.sysUserId, queryForm?.accountId, queryForm?.adgroup, queryForm?.groupAccountIds])
 | 
	
		
			
				|  |  | +    }, [queryForHour, filterQuery, queryForm?.sysUserId, queryForm?.adgroupName, queryForm?.accountId, queryForm?.adgroup, queryForm?.groupAccountIds])
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      const getList = () => {
 | 
	
		
			
				|  |  |          let message = localStorage.getItem(`myAdMonitorConfig1.0.1_${configName}`)
 | 
	
	
		
			
				|  | @@ -122,6 +122,9 @@ function Monitor(props: { onChange: () => void }) {
 | 
	
		
			
				|  |  |          if (queryForm?.groupAccountIds) {
 | 
	
		
			
				|  |  |              params.groupAccountIds = queryForm?.groupAccountIds
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +        if (queryForm?.adgroupName) {
 | 
	
		
			
				|  |  | +            params.adgroupName = queryForm?.adgroupName
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          params.columns = columns
 | 
	
		
			
				|  |  |          getListForHourV3.run(params)
 | 
	
		
			
				|  |  |      }
 | 
	
	
		
			
				|  | @@ -137,17 +140,17 @@ function Monitor(props: { onChange: () => void }) {
 | 
	
		
			
				|  |  |      // // 获取排行数据,柱图
 | 
	
		
			
				|  |  |      useEffect(() => {
 | 
	
		
			
				|  |  |          getPlanCostList()
 | 
	
		
			
				|  |  | -    }, [totalTimeUnit, accountId, sysUserId, groupAccountIds])
 | 
	
		
			
				|  |  | +    }, [totalTimeUnit, accountId, sysUserId, qfadgroupName, groupAccountIds])
 | 
	
		
			
				|  |  |      // 获取今日计划总消耗图谱,折线
 | 
	
		
			
				|  |  |      useEffect(() => {
 | 
	
		
			
				|  |  |          getTootalCostList()
 | 
	
		
			
				|  |  | -    }, [planTimeUnit, adgroup, accountId, sysUserId, groupAccountIds, trendColumns])
 | 
	
		
			
				|  |  | +    }, [planTimeUnit, adgroup, accountId, sysUserId, groupAccountIds, trendColumns, qfadgroupName])
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /** 获取折线图 */
 | 
	
		
			
				|  |  |      const getTootalCostList = useCallback(async () => {
 | 
	
		
			
				|  |  | -        let { totalTimeUnit, planTimeUnit, pageNum, pageSize, adgroup, sysUserId, accountId, ...newQueryForm } = queryForm
 | 
	
		
			
				|  |  | +        let { totalTimeUnit, planTimeUnit, pageNum, pageSize, adgroup, sysUserId, accountId, adgroupName, ...newQueryForm } = queryForm
 | 
	
		
			
				|  |  |          let params = adgroup ? { ...newQueryForm, adgroupIdStr: adgroup } : newQueryForm
 | 
	
		
			
				|  |  | -        let res = await getCostTrendV3List.run({ ...params, timeUnit: planTimeUnit, sysUserIds: sysUserId, accountIdStr: accountId?.join(), trendColumns })
 | 
	
		
			
				|  |  | +        let res = await getCostTrendV3List.run({ ...params, timeUnit: planTimeUnit, sysUserIds: sysUserId, accountIdStr: accountId?.join(), trendColumns, adgroupName })
 | 
	
		
			
				|  |  |          if (res?.data) {
 | 
	
		
			
				|  |  |              let data = trendColumns.map((field) => {
 | 
	
		
			
				|  |  |                  let value: any = { legendName: LineField[field as keyof typeof LineField] }
 | 
	
	
		
			
				|  | @@ -164,9 +167,9 @@ function Monitor(props: { onChange: () => void }) {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /** 获取柱状图 */
 | 
	
		
			
				|  |  |      const getPlanCostList = useCallback(async () => {
 | 
	
		
			
				|  |  | -        let { totalTimeUnit, planTimeUnit, pageNum, pageSize, sysUserId, accountId, ...newQueryForm } = queryForm
 | 
	
		
			
				|  |  | +        let { totalTimeUnit, planTimeUnit, pageNum, pageSize, sysUserId, accountId, adgroupName, ...newQueryForm } = queryForm
 | 
	
		
			
				|  |  |          let { adgroup, ...planQueryFrom } = newQueryForm
 | 
	
		
			
				|  |  | -        let res = await getCostTopV3List.run({ ...planQueryFrom, timeUnit: totalTimeUnit, sysUserIds: sysUserId, accountId: accountId?.join(), topN: 10 })
 | 
	
		
			
				|  |  | +        let res = await getCostTopV3List.run({ ...planQueryFrom, timeUnit: totalTimeUnit, sysUserIds: sysUserId, accountId: accountId?.join(), topN: 10, adgroupName })
 | 
	
		
			
				|  |  |          let data = res?.data?.map((item: { adgroupId: number, cost: number, adgroupName: string, accountId: number }) => {
 | 
	
		
			
				|  |  |              return { name: item.adgroupId.toString(), value: item.cost, adName: item.adgroupName, accountId: item.accountId }
 | 
	
		
			
				|  |  |          })
 | 
	
	
		
			
				|  | @@ -275,6 +278,15 @@ function Monitor(props: { onChange: () => void }) {
 | 
	
		
			
				|  |  |          <Card hoverable bodyStyle={{ padding: '12px 16px' }}>
 | 
	
		
			
				|  |  |              <div style={{ display: 'flex', justifyContent: 'space-between' }}>
 | 
	
		
			
				|  |  |                  <Space>
 | 
	
		
			
				|  |  | +                    <Input
 | 
	
		
			
				|  |  | +                        placeholder="广告名称"
 | 
	
		
			
				|  |  | +                        allowClear
 | 
	
		
			
				|  |  | +                        style={{ width: 150 }}
 | 
	
		
			
				|  |  | +                        onChange={(e: any) => {
 | 
	
		
			
				|  |  | +                            setQueryForm({ ...queryForm, adgroupName: e.target.value, pageNum: 1 })
 | 
	
		
			
				|  |  | +                        }}
 | 
	
		
			
				|  |  | +                        value={queryForm?.adgroupName}
 | 
	
		
			
				|  |  | +                    />
 | 
	
		
			
				|  |  |                      <Select
 | 
	
		
			
				|  |  |                          showSearch
 | 
	
		
			
				|  |  |                          value={queryForm.sysUserId}
 |