Merge branch 'cpq-dev' of wangfan/adweb3-web into master

src/views/adweb/enquiry/AdwebEnquiry.data.ts

@@ -1,5 +1,7 @@
-import { BasicColumn } from '/@/components/Table';
+import { BasicColumn, FormSchema } from '/@/components/Table';
 import { getAction } from '@/api/manage/manage';
+import { rules } from '@/utils/helper/validator';
+import { getAllRolesListNoByTenant, getAllTenantList } from '@/views/system/user/user.api';
 //列表数据
 export const columns: BasicColumn[] = [
   {
@@ -231,6 +233,90 @@ export const wasteColumns: BasicColumn[] = [
   },
 ];
 
+export const formSchema: FormSchema[] = [
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+    required: true,
+    dynamicDisabled: ({ values }) => {
+      return !!values.id;
+    },
+  },
+  {
+    label: '邮箱',
+    field: 'email',
+    component: 'Input',
+    required: true,
+    dynamicRules: ({ model, schema }) => {
+      return [{ ...rules.rule('email', false)[0], trigger: 'blur' }];
+    },
+  },
+  {
+    label: '手机号码',
+    field: 'phone',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }];
+    },
+  },
+  {
+    label: '询盘内容',
+    field: 'message',
+    required: true,
+    component: 'InputTextArea',
+    componentProps: {
+      placeholder: '请输入询盘内容',
+      rows: 8,
+    },
+  },
+  {
+    label: '询盘来源',
+    field: 'fromSource',
+    component: 'Select',
+    componentProps: {
+      mode: 'single',
+      options: [
+        {
+          label: '邮件',
+          value: 'email',
+        },
+        {
+          label: '广告',
+          value: 'ad',
+        },
+        {
+          label: '社媒',
+          value: 'socialMedia',
+        },
+        {
+          label: '聊天',
+          value: 'chat',
+        },
+        {
+          label: '电话',
+          value: 'phone',
+        },
+      ],
+    },
+  },
+  {
+    label: '来源国家',
+    field: 'countryCode',
+    component: 'JSearchSelect',
+    componentProps: {
+      dict: 'adweb_country,country_name,country_iso_code',
+      async: true,
+    },
+  },
+];
+
 // 高级查询数据
 export const superQuerySchema = {
   fromIp: { title: '询盘来源IP', order: 0, view: 'text', type: 'string' },

src/views/adweb/enquiry/AdwebEnquiryList.vue

@@ -2,25 +2,29 @@
   <div class="p-2 adweb-enquiry-list">
     <div class="search-form">
       <a-row class="r1 search-form-container" :gutter="8">
-        <a-col :xl="7" :xxl="6">
+        <a-col :xl="6" :xxl="5">
           <div class="choose-site">
             <span class="t1">站点：</span>
             <select-site ref="selectSiteRef" @set-site-info="getSiteList" select-width="100%" />
           </div>
         </a-col>
-        <a-col :xl="8" :xxl="6">
+        <a-col :xl="7" :xxl="5">
           <div class="choose-site">
             <span class="t1">询盘时间：</span>
             <a-range-picker @change="onChangeDatePciker" :disabledDate="disabledDate" :value="rangeDate" style="width: 70%" />
           </div>
         </a-col>
-        <a-col :xl="9" :xxl="12">
+        <a-col :xl="8" :xxl="10">
           <a-button :class="queryParam.dateType == '' ? 'active' : ''" @click="setTime('')">全部时间 </a-button>
           <a-button :class="queryParam.dateType == 'thirtyDay' ? 'active' : ''" @click="setTime('thirtyDay')">近30天 </a-button>
           <a-button :class="queryParam.dateType == 'sevenDay' ? 'active' : ''" @click="setTime('sevenDay')">近一周 </a-button>
           <a-button :class="queryParam.dateType == 'yesterday' ? 'active' : ''" @click="setTime('yesterday')">昨日 </a-button>
           <a-button :class="queryParam.dateType == 'today' ? 'active' : ''" @click="setTime('today')"> 今日 </a-button>
         </a-col>
+
+        <a-col :xl="3" :xxl="4" v-if="isSuperAdmin">
+          <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleAdd">新增询盘</a-button>
+        </a-col>
       </a-row>
     </div>
 
@@ -248,7 +252,7 @@
   import toTotal from '/@/assets/enquiry/enquiryListTop4.svg';
 
   import selectSite from '/@/components/Adweb/selectSite.vue';
-  import { nextTick, onBeforeMount, onMounted, reactive, ref } from 'vue';
+  import { computed, nextTick, onBeforeMount, onMounted, reactive, ref } from 'vue';
   import { BasicTable } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { columns, superQuerySchema } from './AdwebEnquiry.data';
@@ -258,20 +262,25 @@
   import { getAction, postAction } from '@/api/manage/manage';
 
   import { useMessage } from '@/hooks/web/useMessage';
-
-  import dayjs, { Dayjs } from 'dayjs';
-  const dateFormat = 'YYYY-MM-DD';
-  type RangeValue = [Dayjs, Dayjs];
-  // 过滤日期范围
-  let rangeDate = ref<RangeValue>();
-
   import { filterOption } from 'ant-design-vue/es/vc-mentions/src/util';
   import enquiryDetail from '@/views/adweb/enquiry/modules/enquiryDetail.vue';
   import XpRecycleBinModal from '@/views/adweb/system/modules/XpRecycleBinModal.vue';
   import blackList from '@/views/adweb/enquiry/modules/blackList.vue';
   import enquiryTrackRecord from '@/views/adweb/enquiry/modules/enquiryTrackRecord.vue';
+  import { RoleEnum } from '@/enums/roleEnum';
+  import dayjs, { Dayjs } from 'dayjs';
 
+  const dateFormat = 'YYYY-MM-DD';
+  type RangeValue = [Dayjs, Dayjs];
+  // 过滤日期范围
+  let rangeDate = ref<RangeValue>();
+  const userStore = useUserStore();
   const queryParam = reactive<any>({});
+  console.log(userStore.getRoleList, '当前用户所属角色');
+
+  const isSuperAdmin = computed(() => {
+    return userStore.getRoleList.includes(RoleEnum.ADMIN) || userStore.getRoleList.includes(RoleEnum.ADWEB_CHANNEL_ADMIN);
+  });
 
   const registerModal = ref();
   const selectSiteRef = ref(null);

src/views/adweb/enquiry/components/AdwebEnquiryForm.vue

@@ -6,17 +6,21 @@
           <a-row />
         </a-form>
       </template>
+
+      <template #edit>
+        <BasicForm @register="registerForm" />
+      </template>
     </JFormContainer>
   </a-spin>
 </template>
 
 <script lang="ts" setup>
-  import { computed, defineExpose, defineProps, nextTick, reactive, ref } from 'vue';
+  import { computed, defineExpose, defineProps, nextTick, reactive, ref, unref } from 'vue';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../AdwebEnquiry.api';
-  import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import { BasicForm, useForm } from '@/components/Form';
+  import { formSchema } from '../AdwebEnquiry.data';
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
@@ -24,7 +28,6 @@
     formBpm: { type: Boolean, default: true },
   });
   const formRef = ref();
-  const useForm = Form.useForm;
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
@@ -33,9 +36,13 @@
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
   const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
   const confirmLoading = ref<boolean>(false);
-  //表单验证
-  const validatorRules = reactive({});
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+  const isUpdate = ref(false);
+  //表单配置
+  const [registerForm, { setProps, resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+    labelWidth: 90,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
 
   // 表单禁用
   const disabled = computed(() => {
@@ -73,42 +80,22 @@
     });
   }
 
-  /**
-   * 提交数据
-   */
+  //提交事件
   async function submitForm() {
-    // 触发表单验证
-    await validate();
     confirmLoading.value = true;
-    const isUpdate = ref<boolean>(false);
-    //时间格式化
-    let model = formData;
-    if (model.id) {
-      isUpdate.value = true;
-    }
-    //循环数据
-    for (let data in model) {
-      //如果该数据是数组并且是字符串类型
-      if (model[data] instanceof Array) {
-        let valueType = getValueType(formRef.value.getProps, data);
-        //如果是字符串类型的需要变成以逗号分割的字符串
-        if (valueType === 'string') {
-          model[data] = model[data].join(',');
-        }
-      }
+    try {
+      let values = await validate();
+
+      values.siteCode = localStorage.getItem('siteCode');
+      //提交表单
+      let isUpdateVal = unref(isUpdate);
+
+      await saveOrUpdate(values, isUpdateVal);
+      emit('ok');
+    } finally {
+      confirmLoading.value = false;
+      emit('ok');
     }
-    await saveOrUpdate(model, isUpdate.value)
-      .then((res) => {
-        if (res.success) {
-          createMessage.success(res.message);
-          emit('ok');
-        } else {
-          createMessage.warning(res.message);
-        }
-      })
-      .finally(() => {
-        confirmLoading.value = false;
-      });
   }
 
   defineExpose({

src/views/adweb/site/AdwebSiteList.vue

@@ -173,12 +173,12 @@
 
 <script lang="ts" name="adweb-adwebSite" setup>
   import { computed, onBeforeMount, reactive, ref } from 'vue';
-  import { BasicTable, TableAction } from '/src/components/Table';
-  import { useListPage } from '/src/hooks/system/useListPage';
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
   import { columns, superQuerySchema } from './AdwebSite.data';
   import { batchDelete, deleteOne, getExportUrl, getImportUrl, list, saveOrUpdate } from './AdwebSite.api';
   import AdwebSiteModal from './components/AdwebSiteModal.vue';
-  import { useUserStore } from '/src/store/modules/user';
+  import { useUserStore } from '/@/store/modules/user';
   import SeoProcess from '@/views/adweb/site/components/SeoProcess.vue';
   import JInput from '@/components/Form/src/jeecg/components/JInput.vue';
   import JSearchSelect from '@/components/Form/src/jeecg/components/JSearchSelect.vue';

src/views/dashboard/Analysis/homePage/adweb3Home.vue

@@ -6,7 +6,7 @@
         <div style="display: flex; align-items: center">
           <span class="t1"> 站点： </span>
           <select-site @set-site-info="changeUser" selectWidth="300px" />
-          <a :href="siteDomain" class="web-link" target="_blank">{{ siteDomain }}</a>
+          <a :href="siteDomain" class="web-link" target="_blank">{{ displaySiteDomain }}</a>
         </div>
       </a-col>
     </a-row>
@@ -137,16 +137,16 @@
               </div>
               <!--              </router-link>-->
             </a-col>
-            <template v-if="planType=='SEO'">
+            <template v-if="planType == 'SEO'">
               <a-col :span="4" class="border-right">
-              <div class="wrap blue">
-                <a-spin :spinning="coreInfoLoading">
-                  <div class="fr">
-                    <p class="title">SEO目标达成数</p>
-                    <p>{{ formatNumber(appointWordCount) }}</p>
-                  </div>
-                </a-spin>
-              </div>
+                <div class="wrap blue">
+                  <a-spin :spinning="coreInfoLoading">
+                    <div class="fr">
+                      <p class="title">SEO目标达成数</p>
+                      <p>{{ formatNumber(appointWordCount) }}</p>
+                    </div>
+                  </a-spin>
+                </div>
               </a-col>
               <a-col :span="4" class="border-right">
                 <div class="wrap blue">
@@ -171,14 +171,14 @@
             </template>
             <template v-else>
               <a-col :span="4" class="border-right">
-              <div class="wrap blue">
-                <a-spin :spinning="coreInfoLoading">
-                  <div class="fr">
-                    <p class="title">本周流量</p>
-                    <p>{{ formatNumber(thisWeekData.totalUsers) }}</p>
-                  </div>
-                </a-spin>
-              </div>
+                <div class="wrap blue">
+                  <a-spin :spinning="coreInfoLoading">
+                    <div class="fr">
+                      <p class="title">本周流量</p>
+                      <p>{{ formatNumber(thisWeekData.totalUsers) }}</p>
+                    </div>
+                  </a-spin>
+                </div>
               </a-col>
               <a-col :span="4" class="border-right">
                 <div class="wrap blue">
@@ -201,7 +201,7 @@
                 </div>
               </a-col>
             </template>
-            
+
             <a-col :span="24" style="margin-top: 10px">
               <a-table
                 class="ant-table-striped"
@@ -337,6 +337,7 @@
   //网站概况
 
   const siteDomain = ref('');
+  const displaySiteDomain = ref('临时链接');
   const siteCode = ref('');
   const siteStatus = ref(0);
   let baseInfo = reactive<any>({});
@@ -355,7 +356,6 @@
   const currentMonthEnquiryCount = ref(0);
   const currentWeekEnquiryCount = ref(0);
   const totalEnquiryCount = ref(0);
-  let flowIndicator = ref({});
   let coreDataTable = ref([]);
   const coreDataChart = ref({
     x: [],
@@ -381,6 +381,14 @@
   function changeUser(selectedParamSiteInfo: any) {
     siteCode.value = selectedParamSiteInfo.code;
     siteDomain.value = selectedParamSiteInfo.domain;
+
+    // 如果站点域名中包含adweb，则显示临时链接
+    if (!siteDomain.value.includes('adweb')) {
+      displaySiteDomain.value = siteDomain.value;
+    } else {
+      displaySiteDomain.value = '临时链接';
+    }
+
     siteStatus.value = selectedParamSiteInfo.status;
 
     getAllInfo();
@@ -414,15 +422,13 @@
         current.value = baseInfo.siteStatus;
         isShow.value = true;
         planType.value = baseInfo.planType;
-        if (planType.value == "SEO") {
-          getAction('/seo/seoKeywordsRank/comprehensiveInfo?siteCode='+ siteCode.value).then(function (res) {
+        if (planType.value == 'SEO') {
+          getAction('/seo/seoKeywordsRank/comprehensiveInfo?siteCode=' + siteCode.value).then(function (res) {
             if (res.code == 200) {
-              currentAchieveCount.value = (res.result.achievedAppointKeywordNum || 0) + 
-                                     (res.result.achievedLongTailKeywordNum || 0);
-              appointWordCount.value = (res.result.planKeywordNum || 0) + 
-                                   (res.result.planLongTailKeywordNum || 0);
-              achievePercent.value = appointWordCount.value > 0 ? 
-                                    ((currentAchieveCount.value / appointWordCount.value) * 100).toFixed(2) + '%' : '0%';
+              currentAchieveCount.value = (res.result.achievedAppointKeywordNum || 0) + (res.result.achievedLongTailKeywordNum || 0);
+              appointWordCount.value = (res.result.planKeywordNum || 0) + (res.result.planLongTailKeywordNum || 0);
+              achievePercent.value =
+                appointWordCount.value > 0 ? ((currentAchieveCount.value / appointWordCount.value) * 100).toFixed(2) + '%' : '0%';
             }
           });
         }