diff --git a/src/router/routes/modules/propertyMarketing.ts b/src/router/routes/modules/propertyMarketing.ts index 8a9035d..f85feac 100644 --- a/src/router/routes/modules/propertyMarketing.ts +++ b/src/router/routes/modules/propertyMarketing.ts @@ -151,7 +151,7 @@ const COMPONENTS: AppRouteRecordRaw[] = [ path: 'businessAnalysisReport', name: 'IntelligentSolutionBusinessAnalysisReport', meta: { - locale: '业务分析报告', + locale: '业务洞察报告', requiresAuth: true, roles: ['*'], }, @@ -161,7 +161,7 @@ const COMPONENTS: AppRouteRecordRaw[] = [ path: 'competitiveProductAnalysisReport', name: 'IntelligentSolutionCompetitiveProductAnalysisReport', meta: { - locale: '竟品分析报告', + locale: '竟品对比报告', requiresAuth: true, roles: ['*'], }, diff --git a/src/views/property-marketing/brands/brand-materials/index.vue b/src/views/property-marketing/brands/brand-materials/index.vue index efa96c9..72ac8a0 100644 --- a/src/views/property-marketing/brands/brand-materials/index.vue +++ b/src/views/property-marketing/brands/brand-materials/index.vue @@ -3,18 +3,14 @@
品牌物料 -
- + 添加品牌 - -
+ + 添加品牌
品牌名称 - + @@ -28,7 +24,7 @@ - + @@ -83,7 +79,7 @@ @cancel="handleModalCancel" > @@ -117,8 +113,6 @@ import { ref, computed, reactive, onMounted } from 'vue'; import { Message } from '@arco-design/web-vue'; import { IconDelete } from '@arco-design/web-vue/es/icon'; -import noDataImage from '@/assets/img/guide/no_data.png'; -import '@/views/property-marketing/brands/brand-materials/style.scss'; import { addMaterials, @@ -128,7 +122,6 @@ import { updateMaterials, } from '@/api/all/enterpriseKnowledge'; import ImageUpload from '@/components/upload/ImageUpload.vue'; -import { valid } from 'mockjs'; const searchName = ref(''); const current = ref(1); @@ -145,7 +138,6 @@ const listQuery = reactive({ }); const modalVisible = ref(false); -const modalTitle = ref('编辑品牌'); const formRef = ref(); const formRule = { name: [{ required: true, message: '请输入品牌名称', trigger: ['blur', 'change'] }], @@ -181,8 +173,8 @@ const deleteBrand = (id) => { }; function handleReset() { - searchName.value = ''; - current.value = 1; + listQuery.name = ''; + listQuery.page = 1; } function handleAdd() { @@ -211,7 +203,6 @@ function handleModalOk() { }); } else { addMaterials(form).then((response) => { - console.log(response, 'response'); Message.success('新增成功'); handleSearch(); }); @@ -233,3 +224,7 @@ function handleEdit(id) { }); } + + diff --git a/src/views/property-marketing/brands/brand-materials/style.scss b/src/views/property-marketing/brands/brand-materials/style.scss index 4e5798f..19a03df 100644 --- a/src/views/property-marketing/brands/brand-materials/style.scss +++ b/src/views/property-marketing/brands/brand-materials/style.scss @@ -1,3 +1,5 @@ +@import "@/views/property-marketing/component.scss"; + .view-body { //每块div布局 .part-div { @@ -58,9 +60,16 @@ //添加按钮 .add-btn { - font-size: 16px; + font-size: 15px; padding: 0 24px; border-radius: 4px; + float: right; + width: 110px; + height: 35px; + position: absolute; + line-height: 110px; + right: 35px; + margin-top: 10px } //分页 @@ -192,23 +201,6 @@ left: 10px; } -.arco-textarea-wrapper, -.arco-input-wrapper { - border-radius: 4px; - border-color: #d7d7d9; - background-color: #fff; - - &:focus-within, - &.arco-input-focus { - background-color: var(--color-bg-2); - border-color: rgb(var(--primary-6)); - box-shadow: 0 0 0 0 var(--color-primary-light-2); - } - - &.arco-input-wrapper { - height: 35px; - } -} .form-tip { color: #999; diff --git a/src/views/property-marketing/component.scss b/src/views/property-marketing/component.scss index 6595010..7f53852 100644 --- a/src/views/property-marketing/component.scss +++ b/src/views/property-marketing/component.scss @@ -1,5 +1,6 @@ .arco-input-wrapper, .arco-select-view-single, +.arco-textarea-wrapper, .arco-select-view-multiple { border-radius: 4px; border-color: #d7d7d9; diff --git a/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue b/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue index 56011c2..b33d430 100644 --- a/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue +++ b/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue @@ -2,19 +2,17 @@ - 业务分析报告 - - - + 业务洞察报告 - - + + + + - + - + @@ -57,6 +62,7 @@ - + diff --git a/src/views/property-marketing/put-account/account-dashboard/components/echarts-item/index.vue b/src/views/property-marketing/put-account/account-dashboard/components/echarts-item/index.vue index fe4a1b4..5e609a3 100644 --- a/src/views/property-marketing/put-account/account-dashboard/components/echarts-item/index.vue +++ b/src/views/property-marketing/put-account/account-dashboard/components/echarts-item/index.vue @@ -2,7 +2,7 @@
-
+
- diff --git a/src/views/property-marketing/put-account/account-dashboard/components/echarts-item/style.scss b/src/views/property-marketing/put-account/account-dashboard/components/echarts-item/style.scss index 1901c22..13e2de6 100644 --- a/src/views/property-marketing/put-account/account-dashboard/components/echarts-item/style.scss +++ b/src/views/property-marketing/put-account/account-dashboard/components/echarts-item/style.scss @@ -1,7 +1,21 @@ .echart-item-card { width: 100%; height: 50%; - margin:13px; + margin: 13px; border-radius: 10px; + :deep(.arco-card-header) { + border-bottom: none !important; + + } + + .a-card-title { + color: var(--Text-1, #211F24); + font-size: 16px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + line-height: 24px; + word-wrap: break-word; + } } + diff --git a/src/views/property-marketing/put-account/account-dashboard/index.vue b/src/views/property-marketing/put-account/account-dashboard/index.vue index 9aaebff..6cd56b2 100644 --- a/src/views/property-marketing/put-account/account-dashboard/index.vue +++ b/src/views/property-marketing/put-account/account-dashboard/index.vue @@ -2,7 +2,7 @@
- + @@ -10,71 +10,60 @@
- - - - 项目名称 - - Beijing - Shanghai - Guangzhou - - - - - - 平台 - - Beijing - Shanghai - Guangzhou - - - - - - 运营人员 - - Beijing - Shanghai - Guangzhou - - - - + + + 账户名称 + + Beijing + Shanghai + Guangzhou + + + + 平台 + + Beijing + Shanghai + Guangzhou + + + + 运营人员 + + Beijing + Shanghai + Guangzhou + + + - - - - 时间筛选 - - - - - - - - - - - - - - - - + + + 时间筛选 + + + + + + + + + + + + +
@@ -95,6 +84,89 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -155,8 +227,6 @@ const xhlEcharts = reactive({ }, ], }); - - + diff --git a/src/views/property-marketing/put-account/investment-guidelines/components/month-data/index.vue b/src/views/property-marketing/put-account/investment-guidelines/components/month-data/index.vue index 28852b8..1a9656a 100644 --- a/src/views/property-marketing/put-account/investment-guidelines/components/month-data/index.vue +++ b/src/views/property-marketing/put-account/investment-guidelines/components/month-data/index.vue @@ -30,6 +30,7 @@ - + diff --git a/src/views/property-marketing/put-account/investment-guidelines/components/placement-suggestions/index.vue b/src/views/property-marketing/put-account/investment-guidelines/components/placement-suggestions/index.vue index 6c82c64..777775f 100644 --- a/src/views/property-marketing/put-account/investment-guidelines/components/placement-suggestions/index.vue +++ b/src/views/property-marketing/put-account/investment-guidelines/components/placement-suggestions/index.vue @@ -20,7 +20,7 @@ - +
预算分配 @@ -40,7 +40,7 @@
- +
人群包优化 @@ -67,7 +67,8 @@ - + diff --git a/src/views/property-marketing/put-account/investment-guidelines/components/table-data/placementGuideList.vue b/src/views/property-marketing/put-account/investment-guidelines/components/table-data/placementGuideList.vue index 4f1708e..d4e608d 100644 --- a/src/views/property-marketing/put-account/investment-guidelines/components/table-data/placementGuideList.vue +++ b/src/views/property-marketing/put-account/investment-guidelines/components/table-data/placementGuideList.vue @@ -1,5 +1,5 @@