Merge branch 'master' into cpq-dev

src/api/manage/manage.ts

@@ -1,4 +1,3 @@
-import { VueElement } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 
 const api = {
@@ -151,44 +150,15 @@ export function saveService(parameter) {
  * @param parameter
  * @returns {*}
  */
-export function downFile(url, parameter, timeout) {
+export function downFile(url, parameter) {
   return defHttp.request({
     url: url,
     params: parameter,
     method: 'get',
-    timeout: timeout ? timeout : 1000 * 30,
     responseType: 'blob'
   })
 }
 
-/**
- * 下载文件
- * @param url 文件路径
- * @param fileName 文件名
- * @param parameter
- * @returns {*}
- */
-export function downloadFile(url, fileName, parameter) {
-  return downFile(url, parameter).then((data) => {
-    if (!data || data.size === 0) {
-      VueElement.prototype['$message'].warning('文件下载失败')
-      return
-    }
-    if (typeof window.navigator.msSaveBlob !== 'undefined') {
-      window.navigator.msSaveBlob(new Blob([data]), fileName)
-    } else {
-      let url = window.URL.createObjectURL(new Blob([data]))
-      let link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      link.setAttribute('download', fileName)
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link) //下载完成移除元素
-      window.URL.revokeObjectURL(url) //释放掉blob对象
-    }
-  })
-}
 
 /**
  * 文件上传 用于富文本上传图片
@@ -207,23 +177,3 @@ export function uploadAction(url, parameter) {
   })
 }
 
-/**
- * 获取文件服务访问路径
- * @param avatar
- * @param subStr
- * @returns {*}
- */
-export function getFileAccessHttpUrl(avatar, subStr) {
-  if (!subStr) subStr = 'http'
-  try {
-    if (avatar && avatar.startsWith(subStr)) {
-      return avatar;
-    } else {
-      if (avatar && avatar.length > 0 && avatar.indexOf('[') == -1) {
-        return window._CONFIG['staticDomainURL'] + "/" + avatar;
-      }
-    }
-  } catch (err) {
-    return;
-  }
-}

src/views/adweb/keywords/SeoKeywords.data.ts

@@ -1,302 +1,251 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
+import { BasicColumn } from "/@/components/Table";
+import { FormSchema } from "/@/components/Table";
+import { rules } from "/@/utils/helper/validator";
+import { render } from "/@/utils/common/renderUtils";
+import { getWeekMonthQuarterYear } from "/@/utils";
 //列表数据
 export const columns: BasicColumn[] = [
-   {
-    title: '平台标识',
-    align:"center",
-    dataIndex: 'appKey'
-   },
-   {
-    title: '用户标识',
-    align:"center",
-    dataIndex: 'siteCode'
-   },
-   {
-    title: '关键词',
-    align:"center",
-    dataIndex: 'keywords'
-   },
-   {
-    title: '关键词所属域名',
-    align:"center",
-    dataIndex: 'domain'
-   },
-   {
-    title: '语种',
-    align:"center",
-    dataIndex: 'lang'
-   },
-   {
-    title: '最新搜索时间',
-    align:"center",
-    dataIndex: 'lastSearchTime'
-   },
-   {
-    title: '定时器的最新搜索时间',
-    align:"center",
-    dataIndex: 'timerLastSearchTime'
-   },
-   {
-    title: '0删除，1有效，2过期',
-    align:"center",
-    dataIndex: 'status'
-   },
-   {
-    title: '数据复制源ID',
-    align:"center",
-    dataIndex: 'sourceId'
-   },
-   {
-    title: '关键词优先级（1：高；2：中；3：低）',
-    align:"center",
-    dataIndex: 'priority'
-   },
-   {
-    title: 'SEO关键词优化完成时间',
-    align:"center",
-    dataIndex: 'finishTime'
-   },
-   {
-    title: '优化进度（默认0）',
-    align:"center",
-    dataIndex: 'optimizeProcess'
-   },
-   {
-    title: '优化状态（0：未完成；1：已完成）',
-    align:"center",
-    dataIndex: 'optimizeStatus'
-   },
-   {
-    title: '关键词类型（1：指定；2：长尾）',
-    align:"center",
-    dataIndex: 'keywordType'
-   },
-   {
-    title: '最近一次搜索排名',
-    align:"center",
-    dataIndex: 'lastRank'
-   },
-   {
-    title: '搜索状态，0为普通状态，1为搜索进行中状态',
-    align:"center",
-    dataIndex: 'searchStatus'
-   },
-   {
-    title: '关键词所在URL',
-    align:"center",
-    dataIndex: 'positionUrl'
-   },
-   {
-    title: '相关关键词关联的关键词的id',
-    align:"center",
-    dataIndex: 'relatedKeywordId'
-   },
-   {
-    title: '关键词对应套餐的ID',
-    align:"center",
-    dataIndex: 'planId'
-   },
-   {
-    title: '订购表ID',
-    align:"center",
-    dataIndex: 'subscriptionId'
-   },
-   {
-    title: '网站表ID',
-    align:"center",
-    dataIndex: 'siteId'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
   {
-    label: '平台标识',
-    field: 'appKey',
-    component: 'Input',
-    dynamicRules: ({model,schema}) => {
-          return [
-                 { required: true, message: '请输入平台标识!'},
-          ];
-     },
+    title: "关键词",
+    align: "center",
+    dataIndex: "keywords"
+  },
+  {
+    title: "关键词所在URL",
+    align: "center",
+    dataIndex: "positionUrl",
+  },
+  {
+    title: "关键词类型",
+    align: "center",
+    dataIndex: "keywordType"
   },
   {
-    label: '用户标识',
-    field: 'siteCode',
-    component: 'Input',
-    dynamicRules: ({model,schema}) => {
-          return [
-                 { required: true, message: '请输入用户标识!'},
-          ];
-     },
+    title: '添加时间',
+    align: 'left',
+    dataIndex: 'createTime',
+    sorter: true,
   },
   {
-    label: '关键词',
-    field: 'keywords',
-    component: 'Input',
-    dynamicRules: ({model,schema}) => {
-          return [
-                 { required: true, message: '请输入关键词!'},
-          ];
-     },
+    title: '最新排名日期',
+    align: 'left',
+    dataIndex: 'lastSearchTime',
+    sorter: true,
   },
   {
-    label: '关键词所属域名',
-    field: 'domain',
-    component: 'Input',
-    dynamicRules: ({model,schema}) => {
-          return [
-                 { required: true, message: '请输入关键词所属域名!'},
-          ];
-     },
+    title: '查询日期（定时任务）',
+    align: 'left',
+    dataIndex: 'timerLastSearchTime',
   },
+
   {
-    label: '语种',
-    field: 'lang',
-    component: 'Input',
+    title: '最新排名',
+    align: 'left',
+    dataIndex: 'lastRank',
+    sorter: true,
   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [];
+//表单数据
+export const formSchema: FormSchema[] = [
   {
-    label: '最新搜索时间',
-    field: 'lastSearchTime',
-    component: 'DatePicker',
+    label: "平台标识",
+    field: "appKey",
+    component: "Input",
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: "请输入平台标识!" }
+      ];
+    }
+  },
+  {
+    label: "用户标识",
+    field: "siteCode",
+    component: "Input",
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: "请输入用户标识!" }
+      ];
+    }
+  },
+  {
+    label: "关键词",
+    field: "keywords",
+    component: "Input",
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: "请输入关键词!" }
+      ];
+    }
+  },
+  {
+    label: "关键词所属域名",
+    field: "domain",
+    component: "Input",
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: "请输入关键词所属域名!" }
+      ];
+    }
+  },
+  {
+    label: "语种",
+    field: "lang",
+    component: "Input"
+  },
+  {
+    label: "最新搜索时间",
+    field: "lastSearchTime",
+    component: "DatePicker",
     componentProps: {
-       showTime: true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
-     },
+      showTime: true,
+      valueFormat: "YYYY-MM-DD"
+    }
   },
   {
-    label: '定时器的最新搜索时间',
-    field: 'timerLastSearchTime',
-    component: 'DatePicker',
+    label: "定时器的最新搜索时间",
+    field: "timerLastSearchTime",
+    component: "DatePicker",
     componentProps: {
-       showTime: true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
-     },
+      showTime: true,
+      valueFormat: "YYYY-MM-DD"
+    }
   },
   {
-    label: '0删除，1有效，2过期',
-    field: 'status',
-    component: 'InputNumber',
+    label: "0删除，1有效，2过期",
+    field: "status",
+    component: "InputNumber"
   },
   {
-    label: '数据复制源ID',
-    field: 'sourceId',
-    component: 'InputNumber',
+    label: "数据复制源ID",
+    field: "sourceId",
+    component: "InputNumber"
   },
   {
-    label: '关键词优先级（1：高；2：中；3：低）',
-    field: 'priority',
-    component: 'InputNumber',
+    label: "关键词优先级（1：高；2：中；3：低）",
+    field: "priority",
+    component: "InputNumber"
   },
   {
-    label: 'SEO关键词优化完成时间',
-    field: 'finishTime',
-    component: 'DatePicker',
+    label: "SEO关键词优化完成时间",
+    field: "finishTime",
+    component: "DatePicker",
     componentProps: {
-       showTime: true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
-     },
+      showTime: true,
+      valueFormat: "YYYY-MM-DD"
+    }
+  },
+  {
+    label: "优化进度",
+    field: "optimizeProcess",
+    component: "InputNumber"
   },
   {
-    label: '优化进度（默认0）',
-    field: 'optimizeProcess',
-    component: 'InputNumber',
+    label: "优化状态",
+    field: "optimizeStatus",
+    component: "InputNumber"
   },
   {
-    label: '优化状态（0：未完成；1：已完成）',
-    field: 'optimizeStatus',
-    component: 'InputNumber',
+    label: "关键词类型",
+    field: "keywordType",
+    component: "InputNumber",
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: "请输入关键词类型（1：指定；2：长尾）!" }
+      ];
+    }
   },
   {
-    label: '关键词类型（1：指定；2：长尾）',
-    field: 'keywordType',
-    component: 'InputNumber',
-    dynamicRules: ({model,schema}) => {
-          return [
-                 { required: true, message: '请输入关键词类型（1：指定；2：长尾）!'},
-          ];
-     },
+    label: "最近一次搜索排名",
+    field: "lastRank",
+    component: "InputNumber"
   },
   {
-    label: '最近一次搜索排名',
-    field: 'lastRank',
-    component: 'InputNumber',
+    label: "搜索状态，0为普通状态，1为搜索进行中状态",
+    field: "searchStatus",
+    component: "InputNumber"
   },
   {
-    label: '搜索状态，0为普通状态，1为搜索进行中状态',
-    field: 'searchStatus',
-    component: 'InputNumber',
+    label: "关键词所在URL",
+    field: "positionUrl",
+    component: "InputTextArea"
   },
   {
-    label: '关键词所在URL',
-    field: 'positionUrl',
-    component: 'InputTextArea',
+    label: "相关关键词关联的关键词的id",
+    field: "relatedKeywordId",
+    component: "InputNumber"
   },
   {
-    label: '相关关键词关联的关键词的id',
-    field: 'relatedKeywordId',
-    component: 'InputNumber',
+    label: "关键词对应套餐的ID",
+    field: "planId",
+    component: "Input"
   },
   {
-    label: '关键词对应套餐的ID',
-    field: 'planId',
-    component: 'Input',
+    label: "订购表ID",
+    field: "subscriptionId",
+    component: "Input"
   },
   {
-    label: '订购表ID',
-    field: 'subscriptionId',
-    component: 'Input',
+    label: "网站表ID",
+    field: "siteId",
+    component: "Input"
   },
+  // TODO 主键隐藏字段，目前写死为ID
   {
-    label: '网站表ID',
-    field: 'siteId',
-    component: 'Input',
-  },
-	// TODO 主键隐藏字段，目前写死为ID
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
+    label: "",
+    field: "id",
+    component: "Input",
+    show: false
+  }
 ];
 
 // 高级查询数据
 export const superQuerySchema = {
-  appKey: {title: '平台标识',order: 0,view: 'text', type: 'string',},
-  siteCode: {title: '用户标识',order: 1,view: 'text', type: 'string',},
-  keywords: {title: '关键词',order: 2,view: 'text', type: 'string',},
-  domain: {title: '关键词所属域名',order: 3,view: 'text', type: 'string',},
-  lang: {title: '语种',order: 4,view: 'text', type: 'string',},
-  lastSearchTime: {title: '最新搜索时间',order: 5,view: 'datetime', type: 'string',},
-  timerLastSearchTime: {title: '定时器的最新搜索时间',order: 6,view: 'datetime', type: 'string',},
-  status: {title: '0删除，1有效，2过期',order: 7,view: 'number', type: 'number',},
-  sourceId: {title: '数据复制源ID',order: 8,view: 'number', type: 'number',},
-  priority: {title: '关键词优先级（1：高；2：中；3：低）',order: 9,view: 'number', type: 'number',},
-  finishTime: {title: 'SEO关键词优化完成时间',order: 10,view: 'datetime', type: 'string',},
-  optimizeProcess: {title: '优化进度（默认0）',order: 11,view: 'number', type: 'number',},
-  optimizeStatus: {title: '优化状态（0：未完成；1：已完成）',order: 12,view: 'number', type: 'number',},
-  keywordType: {title: '关键词类型（1：指定；2：长尾）',order: 13,view: 'number', type: 'number',},
-  lastRank: {title: '最近一次搜索排名',order: 14,view: 'number', type: 'number',},
-  searchStatus: {title: '搜索状态，0为普通状态，1为搜索进行中状态',order: 15,view: 'number', type: 'number',},
-  positionUrl: {title: '关键词所在URL',order: 16,view: 'textarea', type: 'string',},
-  relatedKeywordId: {title: '相关关键词关联的关键词的id',order: 17,view: 'number', type: 'number',},
-  planId: {title: '关键词对应套餐的ID',order: 18,view: 'text', type: 'string',},
-  subscriptionId: {title: '订购表ID',order: 19,view: 'text', type: 'string',},
-  siteId: {title: '网站表ID',order: 20,view: 'text', type: 'string',},
+  keywords: { title: "关键词", order: 2, view: "text", type: "string" },
+  lastSearchTime: { title: "最新搜索时间", order: 5, view: "datetime", type: "string" },
+  timerLastSearchTime: {
+    title: "定时器的最新搜索时间",
+    order: 6,
+    view: "datetime",
+    type: "string"
+  },
+  status: { title: "0删除，1有效，2过期", order: 7, view: "number", type: "number" },
+  sourceId: { title: "数据复制源ID", order: 8, view: "number", type: "number" },
+  priority: { title: "关键词优先级（1：高；2：中；3：低）", order: 9, view: "number", type: "number" },
+  finishTime: { title: "SEO关键词优化完成时间", order: 10, view: "datetime", type: "string" },
+  optimizeProcess: { title: "优化进度（默认0）", order: 11, view: "number", type: "number" },
+  optimizeStatus: {
+    title: "优化状态（0：未完成；1：已完成）",
+    order: 12,
+    view: "number",
+    type: "number"
+  },
+  keywordType: { title: "关键词类型（1：指定；2：长尾）", order: 13, view: "number", type: "number" },
+  lastRank: { title: "最近一次搜索排名", order: 14, view: "number", type: "number" },
+  searchStatus: {
+    title: "搜索状态，0为普通状态，1为搜索进行中状态",
+    order: 15,
+    view: "number",
+    type: "number"
+  },
+  positionUrl: { title: "关键词所在URL", order: 16, view: "textarea", type: "string" },
+  relatedKeywordId: {
+    title: "相关关键词关联的关键词的id",
+    order: 17,
+    view: "number",
+    type: "number"
+  },
+  planId: { title: "关键词对应套餐的ID", order: 18, view: "text", type: "string" },
+  subscriptionId: { title: "订购表ID", order: 19, view: "text", type: "string" },
+  siteId: { title: "网站表ID", order: 20, view: "text", type: "string" }
 };
 
 /**
-* 流程表单调用这个方法获取formSchema
-* @param param
-*/
-export function getBpmFormSchema(_formData): FormSchema[]{
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
   // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
   return formSchema;
-}
+}

src/views/adweb/keywords/SeoKeywordsList.vue

@@ -29,7 +29,42 @@
       </template>
       <!--字段回显插槽-->
       <template v-slot:bodyCell="{ column, record, index, text }">
+        <a-radio-group v-if="column.key === 'keywordType'" button-style="solid" @change="onchange($event,record.id)" :value="record.keywordType">
+          <a-radio-button :value=1>
+            指定关键词
+          </a-radio-button>
+          <a-radio-button :value=2>
+            长尾关键词
+          </a-radio-button>
+        </a-radio-group>
       </template>
+     <template #positionUrl="{ text }">
+       <a v-if="text !== null && text !== undefined" :href=text target="_blank">{{ text.replace('https://','').replace('http://','') }}</a>
+       <a v-else>-</a>
+     </template>
+
+     <template #priority="{ text }">
+       <a-tag color="#f50" v-if="text == 1">高</a-tag>
+       <a-tag color="#108ee9" v-if="text == 2">中</a-tag>
+       <a-tag color="#87d068" v-if="text == 3">低</a-tag>
+     </template>
+
+     <template #prioritySlot="{ record, text }">
+       <a-radio-group button-style="solid" @change="onPriorityChange($event, record.id)" :value="text">
+         <a-radio-button :value="1">
+           高
+         </a-radio-button>
+         <a-radio-button :value="2">
+           中
+         </a-radio-button>
+         <a-radio-button :value="3">
+           低
+         </a-radio-button>
+       </a-radio-group>
+     </template>
+     <template #createTime="{ text }">
+
+     </template>
     </BasicTable>
     <!-- 表单区域 -->
     <SeoKeywordsModal @register="registerModal" @success="handleSuccess"></SeoKeywordsModal>
@@ -177,7 +212,31 @@
          }
        ]
    }
+  function onPriorityChange($event, id) {
+    // postAction('/serp/seoKeywords/changePriority' + '?id=' + id + '&value=' + $event.target.value).then(function(res) {
+    //   if (res.code === 200) {
+    //     that.$message.success('优先级更改成功！')
+    //     that.loadData()
+    //   } else {
+    //     that.$message.error('优先级更改失败！')
+    //     return
+    //   }
+    // })
+  }
+  //关键词指定
+  function onchange($event, id) {
 
+    // let that = this
+    // postAction(that.url.changeTypeUrl + '?id=' + id + '&type=' + $event.target.value).then(function(res) {
+    //   if (res.code === 200) {
+    //     that.$message.success('关键词类型更改成功！')
+    //     that.loadData()
+    //   } else {
+    //     that.$message.error(res.message)
+    //     return
+    //   }
+    // })
+  }
 
 </script>
 
@@ -185,4 +244,4 @@
   :deep(.ant-picker),:deep(.ant-input-number){
     width: 100%;
   }
-</style>
+</style>

src/views/adweb/seo/SeoKeywordsRankList.vue

@@ -8,16 +8,16 @@
           <a-popover placement="bottom" v-show="selectSiteInfo.planName  && selectSiteInfo.planType !== 'STATIONCONSTRUCTION'">
             <template #content>
               <span>
-                 指定词数：{{ comprehenInfo.specifyKeywordNum | last }}&nbsp;
+                 指定词数：{{ comprehenInfo.planAppointKeywordNum  }}&nbsp;
               </span>
              <span>
-                 关键词数：{{ comprehenInfo.longTailKeywordNum | last }}&nbsp;
+                 关键词数：{{ comprehenInfo.planLongTailKeywordNum }}&nbsp;
               </span>
               <span>
-                  外链数：{{ comprehenInfo.outerLinkNum | last }}&nbsp;
+                  外链数：{{ comprehenInfo.planOuterLinkNum }}&nbsp;
               </span>
               <span>
-                  文章数：{{ comprehenInfo.articleNum | last }}
+                  文章数：{{ comprehenInfo.planArticleNum }}
               </span>
             </template>
             <img src="https://cutomer-static-bucket.s3.cn-northwest-1.amazonaws.com.cn/public/material/220803883dfy/document/changjianwenti_1676606434975.png" alt="issue" width="25px" height="25px"/>
@@ -28,11 +28,11 @@
     <a-row class="r2" type="flex" justify="center" align="middle">
       <a-col :span="6">
         <p class="t1"><img src="../../../assets/seo/zhidingci.svg"/>指定词</p>
-        <p class="t2" v-if="comprehenInfo.specifyKeywordNum == null">
+        <p class="t2" v-if="comprehenInfo.appointKeywordNum == null">
           -
         </p>
         <p class="t2" v-else>
-          <a @click="changeKeywordType()">{{ comprehenInfo.specifyKeywordNum }}</a>
+          <a @click="changeKeywordType()">{{ comprehenInfo.appointKeywordNum }}</a>
         </p>
       </a-col>
       <a-col :span="6">
@@ -70,19 +70,19 @@
           <p class="t1">指定词排名</p>
           <div class="content">
             <div class="d1"><img src="../../../assets/seo/NO1.svg"/>1-10位</div>
-            <div class="d2"><a @click="getTableInfoRank(3,1)">{{ rankInfo.appointKeyword.firstNum | filtr_null }}</a>个
+            <div class="d2"><a @click="getTableInfoRank(3,1)">{{ rankInfo.appointKeyword.firstNum }}</a>个
             </div>
           </div>
           <div class="content">
             <div class="d1"><img src="../../../assets/seo/NO2.svg"/>11-30位</div>
             <div class="d2"><a @click="getTableInfoRank(7,1)">{{
-                rankInfo.appointKeyword.secondNum | filtr_null }}</a>个
+                rankInfo.appointKeyword.secondNum }}</a>个
             </div>
           </div>
           <div class="content">
             <div class="d1"><img src="../../../assets/seo/NO3.svg"/>31-100位</div>
             <div class="d2"><a @click="getTableInfoRank(8,1)">{{
-                rankInfo.appointKeyword.thirdType | filtr_null}}</a>个
+                rankInfo.appointKeyword.thirdType }}</a>个
             </div>
           </div>
         </div>
@@ -93,19 +93,19 @@
           <div class="content">
             <div class="d1"><img src="../../../assets/seo/NO1.svg"/>1-10位</div>
             <div class="d2">
-              <a @click="longGetTableInfoRank(3)">{{ rankInfo.longTailKeyword.firstNum | filtr_null}}</a>个
+              <a @click="longGetTableInfoRank(3)">{{ rankInfo.longTailKeyword.firstNum }}</a>个
             </div>
           </div>
           <div class="content">
             <div class="d1"><img src="../../../assets/seo/NO2.svg"/>11-30位</div>
             <div class="d2"><a @click="longGetTableInfoRank(7)">{{
-                rankInfo.longTailKeyword.secondNum | filtr_null}}</a>个
+                rankInfo.longTailKeyword.secondNum }}</a>个
             </div>
           </div>
           <div class="content">
             <div class="d1"><img src="../../../assets/seo/NO3.svg"/>31-100位</div>
             <div class="d2"><a @click="longGetTableInfoRank(8)">{{
-                rankInfo.longTailKeyword.thirdType | filtr_null}}</a>个
+                rankInfo.longTailKeyword.thirdType }}</a>个
             </div>
           </div>
         </div>
@@ -114,7 +114,7 @@
     <a-row>
 
     </a-row>
-    <a-row class="r4" v-if="comprehenInfo.specifyKeywordNum != null">
+    <a-row class="r4">
       <a-card title="指定词" :bordered="false" style="width: 100%" >
         <a-col :span="24">
           <a-row  class="table-tool-wrap" type="flex">
@@ -138,7 +138,7 @@
               <a-input
                 placeholder="请输入关键词"
                 style="width: 200px;margin-right: 8px"
-                v-model="keywords"
+                v-model:value="keywords"
               >
               </a-input>
               <a-button type="primary" preIcon="ant-design:search-outlined" style="margin-right: 8px" @click="setTable">
@@ -149,7 +149,7 @@
                 重置
               </a-button>
 
-              <a-button ghost type="primary"  @click="handleExportXlsLU('关键词排名',1)" style="margin-left: 8px" :loading="excelLoading">导出Excel</a-button>
+<!--              <a-button ghost type="primary"  @click="handleExportXlsLU('关键词排名',1)" style="margin-left: 8px" :loading="excelLoading">导出Excel</a-button>-->
             </a-col>
           </a-row>
         </a-col>
@@ -167,39 +167,39 @@
             class="j-table-force-nowrap"
 
             @change="handleTableChange">
-            <template slot='dataNo' slot-scope="text, record, rowIndex">
-              {{(ipagination.current - 1) * ipagination.pageSize + rowIndex + 1}}
-            </template>
-
-            <template class="title" slot="keywords" slot-scope="text,record">
-              <span style="white-space:pre">{{ text }}</span>
-              <span v-if="comprehenInfo.specifyKeywordNum != null && comprehenInfo.longTailKeywordNum != null">
+            <template #bodyCell="{ column, record, index, text }">
+              <template v-if="column.key === 'rowIndex' ">
+                {{(ipagination.current - 1) * ipagination.pageSize + index + 1}}
+              </template>
+
+              <template class="title" v-if="column.key === 'keywords'">
+                <span style="white-space:pre">{{ text }}</span>
+                <span v-if="comprehenInfo.specifyKeywordNum != null && comprehenInfo.longTailKeywordNum != null">
                 <a-tag v-if="record.keywordType == 1" color="blue" style="margin-left: 8px">指定</a-tag>
               </span>
-            </template>
-            <template slot="keywordsLength" slot-scope="text,record">
-              <span >{{ text }}</span>
-            </template>
+              </template>
 
-            <template class="tag" slot="tag" slot-scope="text, record, rowIndex">
-              <a-popover v-if="text != 0" placement="bottom"   overlayClassName="self-pop">
-                <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 1 && text <= 10 " src="../../../assets/seo/NO1.svg"/>
-                <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 11 && text <= 20 "src="../../../assets/seo/NO2.svg"/>
-                <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 21 && text <= 30 " src="../../../assets/seo/NO3.svg"/>
-                <template slot="content">
-                  <p style="margin-bottom: 0">第{{ parseInt((text-1)/10) + 1 }}页，总排名{{ text}}</p>
-                </template>
-                <span style="cursor: default;margin-left: 5px">{{text}}</span>
-              </a-popover>
-              <span v-else>
+              <template class="tag" v-if="column.key === 'tag'">
+                <a-popover v-if="text != 0" placement="bottom"   overlayClassName="self-pop">
+                  <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 1 && text <= 10 " src="../../../assets/seo/NO1.svg"/>
+                  <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 11 && text <= 20 " src="../../../assets/seo/NO2.svg"/>
+                  <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 21 && text <= 30 " src="../../../assets/seo/NO3.svg"/>
+                  <template slot="content">
+                    <p style="margin-bottom: 0">第{{ parseInt((text-1)/10) + 1 }}页，总排名{{ text }}</p>
+                  </template>
+                  <span style="cursor: default;margin-left: 5px">{{text}}</span>
+                </a-popover>
+                <span v-else>
                   <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 1 && text <= 10 " src="../../../assets/seo/NO1.svg"/>
                   <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 11 && text <= 20 "src="../../../assets/seo/NO2.svg"/>
                   <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 21 && text <= 30 " src="../../../assets/seo/NO3.svg"/>
                 {{text}}</span>
+              </template>
+              <template v-if="column.key === 'action'">
+                <a-button  size="small" @click="gotoSearch(record.keywords)" type="primary">去查询</a-button>
+              </template>
             </template>
-            <template slot="action" slot-scope="text,record">
-              <a-button  size="small" @click="gotoSearch(record.keywords)" type="primary">去查询</a-button>
-            </template>
+
 
           </a-table>
         </a-col>
@@ -230,9 +230,10 @@
               <a-input
                 placeholder="请输入关键词"
                 style="width: 200px;margin-right: 8px"
-                v-model="longKeywords"
+                v-model:value="longKeywords"
               >
               </a-input>
+
               <a-button type="primary" preIcon="ant-design:search-outlined" style="margin-right: 8px" @click="longSetTable">
                 查询
               </a-button>
@@ -240,8 +241,7 @@
               <a-button  ghost type="primary" preIcon="ant-design:reload-outlined" @click="longSearchReset">
                 重置
               </a-button>
-
-              <a-button ghost type="primary"  @click="handleExportXlsLU('关键词排名',2)" style="margin-left: 8px" :loading="longExcelLoading">导出Excel</a-button>
+<!--              <a-button ghost type="primary"  @click="handleExportXlsLU('关键词排名',2)" style="margin-left: 8px" :loading="longExcelLoading">导出Excel</a-button>-->
             </a-col>
           </a-row>
         </a-col>
@@ -259,41 +259,30 @@
             class="j-table-force-nowrap"
 
             @change="handleLongTableChange">
-            <template slot='dataNo' slot-scope="text, record, rowIndex">
-              {{(longIpagination.current - 1) * longIpagination.pageSize + rowIndex + 1}}
-            </template>
-
-            <template class="title" slot="keywords" slot-scope="text,record">
-              <span style="white-space:pre">{{ text }}</span>
-              <span v-if="comprehenInfo.specifyKeywordNum != null && comprehenInfo.longTailKeywordNum != null">
-                <a-tag v-if="record.keywordType == 1" color="blue" style="margin-left: 8px">指定</a-tag>
-                <!--              <a-tag v-if="record.keywordType == 2" color="green" style="margin-left: 8px">长尾</a-tag>-->
-              </span>
-            </template>
-            <template slot="keywordsLength" slot-scope="text,record">
-              <span >{{ text }}</span>
-            </template>
-
-            <template class="tag" slot="tag" slot-scope="text, record, rowIndex">
-              <a-popover v-if="text != 0" placement="bottom"   overlayClassName="self-pop">
-                <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 1 && text <= 10 " src="../../../assets/seo/NO1.svg"/>
-                <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 11 && text <= 20 "src="../../../assets/seo/NO2.svg"/>
-                <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 21 && text <= 30 " src="../../../assets/seo/NO3.svg"/>
-                <template slot="content">
-                  <p style="margin-bottom: 0">第{{ parseInt((text-1)/10) + 1 }}页，总排名{{ text}}</p>
-                </template>
-                <span style="cursor: default;margin-left: 5px">{{text}}</span>
-              </a-popover>
-              <span v-else>
+            <template #bodyCell="{column, record, index, text}">
+              <template v-if="column.key === 'rowIndex'">
+                {{(longIpagination.current - 1) * longIpagination.pageSize + index + 1}}
+              </template>
+              <template class="tag" v-if="column.key === 'tag'">
+                <a-popover v-if="text != 0" placement="bottom"   overlayClassName="self-pop">
+                  <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 1 && text <= 10 " src="../../../assets/seo/NO1.svg"/>
+                  <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 11 && text <= 20 "src="../../../assets/seo/NO2.svg"/>
+                  <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 21 && text <= 30 " src="../../../assets/seo/NO3.svg"/>
+                  <template slot="content">
+                    <p style="margin-bottom: 0">第{{ parseInt((text-1)/10) + 1 }}页，总排名{{ text}}</p>
+                  </template>
+                  <span style="cursor: default;margin-left: 5px">{{text}}</span>
+                </a-popover>
+                <span v-else>
                   <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 1 && text <= 10 " src="../../../assets/seo/NO1.svg"/>
                   <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 11 && text <= 20 "src="../../../assets/seo/NO2.svg"/>
                   <img style="width: 18px;position: relative;top: -2px;" v-if="text >= 21 && text <= 30 " src="../../../assets/seo/NO3.svg"/>
                 {{text}}</span>
+              </template>
+              <template slot="action" v-if="column.key === 'action'">
+                <a-button  size="small" @click="gotoSearch(record.keywords)" type="primary">去查询</a-button>
+              </template>
             </template>
-            <template slot="action" slot-scope="text,record">
-              <a-button  size="small" @click="gotoSearch(record.keywords)" type="primary">去查询</a-button>
-            </template>
-
           </a-table>
         </a-col>
       </a-card>
@@ -307,7 +296,6 @@
 import { getAction, downFile} from '@/api/manage/manage'
 import selectSite from '@/components/adweb/selectSite.vue';
 import { filterObj } from '/@/utils/common/compUtils';
-
 export default {
   name: 'seoKeywordsRankList',
   components: {
@@ -326,15 +314,12 @@ export default {
           width: 40,
           align: 'center',
           fixed: 'left',
-          scopedSlots: { customRender: 'dataNo' },
-
         },
         {
           title: '关键词',
           dataIndex: 'keywords',
           key: 'keywords',
           fixed: 'left',
-          scopedSlots: { customRender: 'keywords' },
           width: 350,
         },
       ],
@@ -346,15 +331,12 @@ export default {
           width: 40,
           align: 'center',
           fixed: 'left',
-          scopedSlots: { customRender: 'dataNo' },
-
         },
         {
           title: '关键词',
           dataIndex: 'keywords',
           key: 'keywords',
           fixed: 'left',
-          scopedSlots: { customRender: 'keywords' },
           width: 350,
         },
       ],
@@ -429,31 +411,6 @@ export default {
   mounted() {
     this.getSiteInfo()
   },
-  filters: {
-    first: function (value) {
-      if (value && value != null) {
-        let a = value.split('/')
-        return a[0]
-      } else {
-        return '- '
-      }
-    },
-    last: function (value) {
-      if (value && value != null) {
-        let a = value.split('/')
-        return a[1]
-      } else {
-        return ' -'
-      }
-    },
-    filtr_null: function (value) {
-      if (value != null) {
-        return value
-      } else {
-        return '- '
-      }
-    },
-  },
   watch: {
     '$route.query': {
       handler: function (val) {
@@ -472,7 +429,7 @@ export default {
     getAllInfo() {
       this.getComprehenInfo()
     },
-    resetAllInfo(){
+    resetAllInfo() {
       this.comprehenInfo = {}
       this.rankInfo.appointKeyword = {}
       this.rankInfo.longTailKeyword = {}
@@ -488,32 +445,26 @@ export default {
     //由于页面的业务关联很多，故将所有的查询条件封装
     setTableQuery() {
       this.queryParam.siteCode = this.siteCode
-      console.log(this.queryParam)
-      if(this.show == 3){
+      if (this.show == 3) {
         this.queryParam.rankStart = '1'
         this.queryParam.rankEnd = '10'
-      }
-      else if(this.show == 4){
+      } else if (this.show == 4) {
         this.queryParam.rankStart = '1'
         this.queryParam.rankEnd = '30'
 
-      }
-      else if(this.show == 5){
+      } else if (this.show == 5) {
         this.queryParam.rankStart = '1'
         this.queryParam.rankEnd = '50'
-      }
-      else if(this.show == 6){
+      } else if (this.show == 6) {
         this.queryParam.rankStart = '1'
         this.queryParam.rankEnd = '100'
-      }
-      else if(this.show == 7){
+      } else if (this.show == 7) {
         this.queryParam.rankStart = '11'
         this.queryParam.rankEnd = '30'
-      }
-      else if(this.show == 8){
+      } else if (this.show == 8) {
         this.queryParam.rankStart = '31'
         this.queryParam.rankEnd = '100'
-      }else{
+      } else {
         this.queryParam.rankStart = undefined
         this.queryParam.rankEnd = undefined
       }
@@ -521,7 +472,7 @@ export default {
       this.queryParam.keywords = this.keywords
       this.loadData(1)
     },
-    setTable(){
+    setTable() {
       this.queryParam.reachStandard = undefined
       this.setTableQuery()
     },
@@ -552,30 +503,30 @@ export default {
       this.loading = true
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
-          let alldata  = res.result.records
-          if(alldata.length > 0){
-            for(let i in alldata){
+          let alldata = res.result.records
+          if (alldata.length > 0) {
+            for (let i in alldata) {
               let rankInfo = alldata[i].rankInfo;
               a.push({
-                id:alldata[i].id,
-                keywords:alldata[i].keywords,
-                keywordType:alldata[i].keywordType,
-                keywordsLength:alldata[i].keywordsLength,
-                rankInfo:rankInfo,
+                id: alldata[i].id,
+                keywords: alldata[i].keywords,
+                keywordType: alldata[i].keywordType,
+                keywordsLength: alldata[i].keywordsLength,
+                rankInfo: rankInfo,
                 ...rankInfo
               })
             }
             this.dataSource = a;
             this.getTableColums()
             this.ipagination.total = res.result.total
-          }else{
+          } else {
             this.dataSource = a;
             this.ipagination.total = 0
           }
 
         }
         if (res.code === 510) {
-          this.$message.warning(res.message)
+          // this.$message.warning(res.message)
         }
         this.loading = false
       })
@@ -584,10 +535,10 @@ export default {
     //先执行获取site信息，只有在获取到siteCode之后，才能执行以下方法
     getSiteInfo() {
       let that = this
-      getAction('/seo/seoKeywordsRank/getAllSites').then(function (res) {
+      getAction('/seo/seoKeywordsRank/getAllSites').then(function(res) {
         if (res.code == 200) {
           that.siteinfo = res.result
-          if(res.result.length > 0){
+          if (res.result.length > 0) {
             let isInSite = false
             for (let i in res.result) {
               if (localStorage.getItem('siteCode') !== null && res.result[i].code === localStorage.getItem('siteCode')) {
@@ -604,10 +555,10 @@ export default {
             }
           }
           //如果是从客户案例过来的数据，直接走下面方法
-          if(that.routerQuery.code){
+          if (that.routerQuery.code) {
             let rowData = {}
-            for(let i in res.result){
-              if(that.routerQuery.code === res.result[i].code){
+            for (let i in res.result) {
+              if (that.routerQuery.code === res.result[i].code) {
                 rowData = res.result[i]
               }
             }
@@ -623,7 +574,7 @@ export default {
           that.resetAllInfo()
           that.getAllInfo()
         } else {
-          that.$message.error('获取站点code失败，请刷新重试')
+          // that.$message.error('获取站点code失败，请刷新重试')
         }
       })
     },
@@ -634,7 +585,7 @@ export default {
       if (Object.keys(sorter).length > 0 && sorter.column) {
         this.isorter.column = sorter.field;
         this.isorter.order = "ascend" === sorter.order ? "asc" : "desc"
-      } else{
+      } else {
         this.isorter.column = '';
         this.isorter.order = '';
       }
@@ -644,11 +595,11 @@ export default {
     getQueryParams() {
       //获取查询条件
       let sqp = {}
-      if(this.superQueryParams){
-        sqp['superQueryParams']=encodeURI(this.superQueryParams)
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
         sqp['superQueryMatchType'] = this.superQueryMatchType
       }
-      var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
       param.field = this.getQueryField();
       param.pageNo = this.ipagination.current;
       param.pageSize = this.ipagination.pageSize;
@@ -657,7 +608,7 @@ export default {
     getQueryField() {
       //TODO 字段权限控制
       var str = "id,";
-      this.columns.forEach(function (value) {
+      this.columns.forEach(function(value) {
         str += "," + value.dataIndex;
       });
       return str;
@@ -682,14 +633,13 @@ export default {
       let that = this
       let d = {
         siteCode: that.siteCode,
-        subscriptionId: that.selectSiteInfo.subscriptionId ? that.selectSiteInfo.subscriptionId : ''
+        planId: that.selectSiteInfo.planId ? that.selectSiteInfo.planId : ''
       }
       getAction('/seo/seoKeywordsRank/comprehensiveInfo', d).then(res => {
         if (res.code == 200) {
           that.comprehenInfo = res.result
-          console.log(res.result)
         }
-      }).finally(()=>{
+      }).finally(() => {
         this.getRankInfo()
         this.setTableQuery()
         this.longSetTableQuery()
@@ -754,23 +704,23 @@ export default {
         key: 'action',
         align: 'center',
         scopedSlots: { customRender: 'action' },
-        fixed:'right',
+        fixed: 'right',
         width: 50
       },)
     },
 
     //点击排名数量事件
-    getTableInfoRank(d,keywordType) {
+    getTableInfoRank(d, keywordType) {
       this.show = d
       this.queryParam.reachStandard = undefined
-      if(keywordType){
+      if (keywordType) {
         this.keywordType = keywordType
       }
       this.setTableQuery()
     },
 
     //点击第一行五个指标的种类
-    changeKeywordType(){
+    changeKeywordType() {
       this.queryParam.reachStandard = 1
       this.queryParam.rankStart = undefined
       this.queryParam.rankEnd = undefined
@@ -779,49 +729,52 @@ export default {
     },
 
     //表格内的去查询按钮
-    gotoSearch(word){
+    gotoSearch(word) {
       window.open("https://www.google.com/search?q=" + word, '_blank');
     },
 
-    handleExportXlsLU(fileName,keywordType){
+    handleExportXlsLU(fileName, keywordType) {
       let that = this
       let param = {
         siteCode: that.queryParam.siteCode,
         subscriptionId: that.selectSiteInfo.subscriptionId ? that.selectSiteInfo.subscriptionId : '',
         keywordType: keywordType
       }
-      if (param.siteId === 0) {
-        this.$message.warning("请先选择站点！");
+      if (param.siteCode === '') {
+        console.log(123)
+        // this.$message.warning("请先选择站点！");
         return;
       }
-      if(keywordType == 1){
+      if (keywordType == 1) {
         this.excelLoading = true;
-      }else{
+      } else {
         this.longExcelLoading = true;
       }
 
-      downFile("/seo/seoKeywords/exportExcel",param).then((data)=>{
-        if(keywordType == 1){
+      downFile("/seo/seoKeywords/exportExcel", param).then((data) => {
+        if (keywordType === 1) {
           this.excelLoading = false;
-        }else{
+        } else {
           this.longExcelLoading = false;
         }
         if (!data) {
-          this.$message.warning("文件下载失败")
+          console.log(321)
+          // this.$message.warning("文件下载失败")
           return
         }
-        if (data.size == 0) {
-          this.$message.warning("当前站点未有关键词数据，文件导出失败")
+        if (data.size === 0) {
+          console.log(111)
+          // this.$message.warning("当前站点未有关键词数据，文件导出失败")
           return
         }
         if (typeof window.navigator.msSaveBlob !== 'undefined') {
-          window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xlsx')
-        }else{
-          let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
+          window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx')
+        } else {
+          let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
           let link = document.createElement('a')
           link.style.display = 'none'
           link.href = url
-          link.setAttribute('download', fileName+'.xlsx')
+          link.setAttribute('download', fileName + '.xlsx')
           document.body.appendChild(link)
           link.click()
           document.body.removeChild(link); //下载完成移除元素
@@ -830,14 +783,10 @@ export default {
       })
     },
 
-    getServiceDays(planStartTime) {
-      return moment().diff(moment(planStartTime), 'days') + 1;
-    },
-
     //按排名排序
-    rankingClick(){
+    rankingClick() {
       let that = this;
-      if(that.rankingButtonStatus == false){
+      if (that.rankingButtonStatus == false) {
         that.rankingButtonStatus = true
         that.rankingButtonArrow = 'arrow-up'
         that.wordsButtonStatus = false
@@ -845,12 +794,12 @@ export default {
 
         that.queryParam.buttonColmn = 'ranking';
         that.queryParam.buttonSort = 'asc';
-      } else if(that.rankingButtonStatus == true && that.rankingButtonArrow == 'arrow-up'){
+      } else if (that.rankingButtonStatus == true && that.rankingButtonArrow == 'arrow-up') {
         that.rankingButtonArrow = 'arrow-down'
 
         that.queryParam.buttonColmn = 'ranking';
         that.queryParam.buttonSort = 'desc';
-      }else if(that.rankingButtonArrow == 'arrow-down'){
+      } else if (that.rankingButtonArrow == 'arrow-down') {
         that.rankingButtonStatus = false
         that.queryParam.buttonColmn = '';
         that.queryParam.buttonSort = '';
@@ -859,9 +808,9 @@ export default {
     },
 
     //按字数排序
-    wordsClick(){
+    wordsClick() {
       let that = this;
-      if(that.wordsButtonStatus == false){
+      if (that.wordsButtonStatus == false) {
         that.wordsButtonStatus = true
         that.wordsButtonArrow = 'arrow-up'
         that.rankingButtonStatus = false
@@ -869,12 +818,12 @@ export default {
 
         that.queryParam.buttonColmn = 'words';
         that.queryParam.buttonSort = 'asc';
-      } else if(that.wordsButtonStatus == true && that.wordsButtonArrow == 'arrow-up'){
+      } else if (that.wordsButtonStatus == true && that.wordsButtonArrow == 'arrow-up') {
         that.wordsButtonArrow = 'arrow-down'
 
         that.queryParam.buttonColmn = 'words';
         that.queryParam.buttonSort = 'desc';
-      }else if(that.wordsButtonArrow == 'arrow-down'){
+      } else if (that.wordsButtonArrow == 'arrow-down') {
         that.wordsButtonStatus = false
         that.queryParam.buttonColmn = '';
         that.queryParam.buttonSort = '';
@@ -895,30 +844,30 @@ export default {
       this.longLoading = true
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
-          let alldata  = res.result.records
-          if(alldata.length > 0){
-            for(let i in alldata){
+          let alldata = res.result.records
+          if (alldata.length > 0) {
+            for (let i in alldata) {
               let rankInfo = alldata[i].rankInfo;
               a.push({
-                id:alldata[i].id,
-                keywords:alldata[i].keywords,
-                keywordType:alldata[i].keywordType,
-                keywordsLength:alldata[i].keywordsLength,
-                rankInfo:rankInfo,
+                id: alldata[i].id,
+                keywords: alldata[i].keywords,
+                keywordType: alldata[i].keywordType,
+                keywordsLength: alldata[i].keywordsLength,
+                rankInfo: rankInfo,
                 ...rankInfo
               })
             }
             this.longDataSource = a;
             this.longGetTableColums()
             this.longIpagination.total = res.result.total
-          }else{
+          } else {
             this.longDataSource = a;
             this.longIpagination.total = 0
           }
 
         }
         if (res.code === 510) {
-          this.$message.warning(res.message)
+          // this.$message.warning(res.message)
         }
         this.longLoading = false
       })
@@ -975,7 +924,7 @@ export default {
         key: 'action',
         align: 'center',
         scopedSlots: { customRender: 'action' },
-        fixed:'right',
+        fixed: 'right',
         width: 50
       },)
     },
@@ -985,31 +934,26 @@ export default {
       let that = this;
       that.longQueryParam.siteCode = this.siteCode
       console.log(that.longQueryParam)
-      if(that.longShow == 3){
+      if (that.longShow == 3) {
         that.longQueryParam.rankStart = '1'
         that.longQueryParam.rankEnd = '10'
-      }
-      else if(that.longShow == 4){
+      } else if (that.longShow == 4) {
         that.longQueryParam.rankStart = '1'
         that.longQueryParam.rankEnd = '30'
 
-      }
-      else if(that.longShow == 5){
+      } else if (that.longShow == 5) {
         that.longQueryParam.rankStart = '1'
         that.longQueryParam.rankEnd = '50'
-      }
-      else if(that.longShow == 6){
+      } else if (that.longShow == 6) {
         that.longQueryParam.rankStart = '1'
         that.longQueryParam.rankEnd = '100'
-      }
-      else if(that.longShow == 7){
+      } else if (that.longShow == 7) {
         that.longQueryParam.rankStart = '11'
         that.longQueryParam.rankEnd = '30'
-      }
-      else if(that.longShow == 8){
+      } else if (that.longShow == 8) {
         that.longQueryParam.rankStart = '31'
         that.longQueryParam.rankEnd = '100'
-      }else{
+      } else {
         that.longQueryParam.rankStart = undefined
         that.longQueryParam.rankEnd = undefined
       }
@@ -1017,7 +961,7 @@ export default {
       that.longLoadData(1)
     },
 
-    longSetTable(){
+    longSetTable() {
       this.longQueryParam.reachStandard = undefined
       this.longSetTableQuery()
     },
@@ -1043,7 +987,7 @@ export default {
     },
 
     //点击第一行五个指标的种类
-    longChangeKeywordType(){
+    longChangeKeywordType() {
       this.longQueryParam.reachStandard = 1
       this.longQueryParam.rankStart = undefined
       this.longQueryParam.rankEnd = undefined
@@ -1057,7 +1001,7 @@ export default {
       if (Object.keys(sorter).length > 0 && sorter.column) {
         this.longIsorter.column = sorter.field;
         this.longIsorter.order = "ascend" == sorter.order ? "asc" : "desc"
-      } else{
+      } else {
         this.longIsorter.column = '';
         this.longIsorter.order = '';
       }
@@ -1068,7 +1012,7 @@ export default {
     getLongQueryParams() {
       //获取查询条件
       let sqp = {}
-      var param = Object.assign(sqp, this.longQueryParam, this.longIsorter ,this.filters);
+      var param = Object.assign(sqp, this.longQueryParam, this.longIsorter, this.filters);
       param.field = this.getLongQueryField();
       param.pageNo = this.longIpagination.current;
       param.pageSize = this.longIpagination.pageSize;
@@ -1077,16 +1021,16 @@ export default {
     getLongQueryField() {
       //TODO 字段权限控制
       var str = "id,";
-      this.longColumns.forEach(function (value) {
+      this.longColumns.forEach(function(value) {
         str += "," + value.dataIndex;
       });
       return str;
     },
 
     //按排名排序
-    longRankingClick(){
+    longRankingClick() {
       let that = this;
-      if(that.longRankingButtonStatus == false){
+      if (that.longRankingButtonStatus == false) {
         that.longRankingButtonStatus = true
         that.longRankingButtonArrow = 'arrow-up'
         that.longWordsButtonStatus = false
@@ -1094,12 +1038,12 @@ export default {
 
         that.longQueryParam.buttonColmn = 'ranking';
         that.longQueryParam.buttonSort = 'asc';
-      } else if(that.longRankingButtonStatus == true && that.longRankingButtonArrow == 'arrow-up'){
+      } else if (that.longRankingButtonStatus == true && that.longRankingButtonArrow == 'arrow-up') {
         that.longRankingButtonArrow = 'arrow-down'
 
         that.longQueryParam.buttonColmn = 'ranking';
         that.longQueryParam.buttonSort = 'desc';
-      }else if(that.longRankingButtonArrow == 'arrow-down'){
+      } else if (that.longRankingButtonArrow == 'arrow-down') {
         that.longRankingButtonStatus = false
         that.longQueryParam.buttonColmn = '';
         that.longQueryParam.buttonSort = '';
@@ -1108,9 +1052,9 @@ export default {
     },
 
     //按字数排序
-    longWordsClick(){
+    longWordsClick() {
       let that = this;
-      if(that.longWordsButtonStatus == false){
+      if (that.longWordsButtonStatus == false) {
         that.longWordsButtonStatus = true
         that.longWordsButtonArrow = 'arrow-up'
         that.longRankingButtonStatus = false
@@ -1118,12 +1062,12 @@ export default {
 
         that.longQueryParam.buttonColmn = 'words';
         that.longQueryParam.buttonSort = 'asc';
-      } else if(that.longWordsButtonStatus == true && that.longWordsButtonArrow == 'arrow-up'){
+      } else if (that.longWordsButtonStatus == true && that.longWordsButtonArrow == 'arrow-up') {
         that.longWordsButtonArrow = 'arrow-down'
 
         that.longQueryParam.buttonColmn = 'words';
         that.longQueryParam.buttonSort = 'desc';
-      }else if(that.longWordsButtonArrow == 'arrow-down'){
+      } else if (that.longWordsButtonArrow == 'arrow-down') {
         that.longWordsButtonStatus = false
         that.longQueryParam.buttonColmn = '';
         that.longQueryParam.buttonSort = '';
@@ -1135,15 +1079,17 @@ export default {
 </script>
 
 <style lang="less">
-.self-pop{
-  .ant-popover-inner-content{
-    background: rgb(245,243,254);
-    p{
+.self-pop {
+  .ant-popover-inner-content {
+    background: rgb(245, 243, 254);
+
+    p {
       font-size: 13px;
     }
   }
-  .ant-popover-arrow{
-    border-color: rgb(245,243,254) !important;
+
+  .ant-popover-arrow {
+    border-color: rgb(245, 243, 254) !important;
   }
 }
 </style>
@@ -1192,6 +1138,8 @@ export default {
 .r3 {
   padding-left: 10px;
   padding-right: 10px;
+  padding-bottom: 10px;
+
   .wrap {
     padding: 20px;
     background: #fff;
@@ -1270,6 +1218,7 @@ export default {
         font-weight: 500;
         cursor: pointer;
         text-decoration: underline;
+
         &.active {
           color: @primary-color;
         }