From 89213fed0c844fe7100c91957b793d07095c6002 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Fri, 6 May 2022 15:23:14 +0800
Subject: [PATCH] zx

---
 src/api/ThemeComparison/index.js              | 15 ++++++++++++-
 src/components/v-card-button/index.vue        |  2 +-
 src/views/ThemeAnalize/index.vue              | 21 +++++++++++--------
 src/views/ThemeAnalize/tbEvent.js             |  1 +
 src/views/ThemeComparison/ThemeIndex.vue      |  8 +++----
 .../themeCompateHeader/index.vue              |  2 +-
 6 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/api/ThemeComparison/index.js b/src/api/ThemeComparison/index.js
index 43deaef..9f8d783 100644
--- a/src/api/ThemeComparison/index.js
+++ b/src/api/ThemeComparison/index.js
@@ -1,5 +1,18 @@
 import httpService from "@/request"
 
+// 主题对比-列表选择
+export function getSchemeDataToTheme(params) {
+    let obj =  Object.assign({action: 'getSchemeDataToTheme', sType: 'contrast'}, params)
+    return httpService({
+        url: `/api/v6.ashx`,
+        method: 'post',
+        data: obj,
+        headers: {
+            'content-type': 'application/x-www-form-urlencoded'
+        }
+    })
+}
+
 // 主题对比-信息量趋势
 export function getCountTime0528C(params) {
     let obj =  Object.assign({action: 'getCountTime0528C', sType: 'BrandOverview',iContrastType: '4'}, params)
@@ -102,4 +115,4 @@ export function getPositiveAndNegative0528C(params) {
             'content-type': 'application/x-www-form-urlencoded'
         }
     })
-}
\ No newline at end of file
+}
diff --git a/src/components/v-card-button/index.vue b/src/components/v-card-button/index.vue
index 07c6393..01d0997 100644
--- a/src/components/v-card-button/index.vue
+++ b/src/components/v-card-button/index.vue
@@ -12,7 +12,7 @@
             <a @click="edit" class="card-edit">编辑</a>
             <a-popconfirm @confirm="del" @cancel="cancel"> 
                 <div slot="title" style="color: white">此操作将删除数据，是否继续？</div>  
-                <a @click="del" class="card-delete">删除</a>
+                <a class="card-delete">删除</a>
             </a-popconfirm>
         
     </div>
diff --git a/src/views/ThemeAnalize/index.vue b/src/views/ThemeAnalize/index.vue
index 9c390d4..cce7e51 100644
--- a/src/views/ThemeAnalize/index.vue
+++ b/src/views/ThemeAnalize/index.vue
@@ -42,15 +42,11 @@
                       <a-tab-pane class="tab-pane" key="1" tab="往期主题">
                           <div class="card-items" v-for="(item, index) in myThemeArr" :key="index">
                               <div class="card-item-top">
-                                  <a-button type="primary" v-if="item.isCom">进行中</a-button>
-                                  <a-button v-else disabled>已完成</a-button>
-                                  <a-button-group style="float: right">
-                                      <a-button type="primary" @click="handlerEdit(item.guids)">编辑</a-button>
-                                      <a-popconfirm @confirm="handlerDel(item.guids)" @cancel="cancel"> 
-                                        <div slot="title" style="color: white">此操作将删除数据，是否继续？</div>  
-                                        <a-button type="primary">删除</a-button>
-                                      </a-popconfirm>
-                                  </a-button-group>
+                                  <div class="card-uncomp" v-if="item.isCom">
+                                      <span style="margin-top: 5px">进行中</span>
+                                  </div>
+                                  <div class="card-completed" v-else>已完成</div>
+                                  <v-card-button @edit="handlerEdit(item.guids)" @del="handlerDel(item.guids)"></v-card-button>
                               </div>
                               <div class="card-item-data" @click="toThemeData(item.guids,item.name)">
                                   <div class="cid-title">
@@ -125,6 +121,9 @@
                                   <a-form-model-item label="作者">
                                       <a-textarea placeholder="请输入作者名称，多个词用，隔开，最多支持5个" v-model="addForm.DetailsData[0].UserAuthor"></a-textarea>
                                   </a-form-model-item>
+                                  <a-form-model-item label="域名">
+                                      <a-textarea placeholder="请输入域名名称，多个词用，隔开，最多支持5个" v-model="addForm.DetailsData[0].Domain"></a-textarea>
+                                  </a-form-model-item>
                               </a-form-model>
                           </div>
                           <div class="modal-display">
@@ -168,6 +167,9 @@
                                   <a-form-model-item label="作者">
                                       <a-textarea placeholder="请输入作者名称，多个词用，隔开，最多支持5个" v-model="addForm.DetailsData[0].UserAuthor"></a-textarea>
                                   </a-form-model-item>
+                                  <a-form-model-item label="域名">
+                                      <a-textarea placeholder="请输入域名名称，多个词用，隔开，最多支持5个" v-model="addForm.DetailsData[0].Domain"></a-textarea>
+                                  </a-form-model-item>
                               </a-form-model>
                           </div>
                           <div class="modal-display">
@@ -221,6 +223,7 @@ export default {
                      HuoWord1: "",
                      PaiChu: "",
                      Source: "",
+                     Domain: "",
                      UserAuthor: "",
                      IsAdvancedQuery: 0 //0和 1高级 2或
                     }
diff --git a/src/views/ThemeAnalize/tbEvent.js b/src/views/ThemeAnalize/tbEvent.js
index 4e4a906..67b7420 100644
--- a/src/views/ThemeAnalize/tbEvent.js
+++ b/src/views/ThemeAnalize/tbEvent.js
@@ -198,6 +198,7 @@ export default {
                  HuoWord1: "",
                  PaiChu: "",
                  Source: "",
+                 Domain: "",
                  UserAuthor: "",
                  IsAdvancedQuery: this.addForm.DetailsData[0].IsAdvancedQuery //0普通 1高级
                 }
diff --git a/src/views/ThemeComparison/ThemeIndex.vue b/src/views/ThemeComparison/ThemeIndex.vue
index 4c87926..c2c7548 100644
--- a/src/views/ThemeComparison/ThemeIndex.vue
+++ b/src/views/ThemeComparison/ThemeIndex.vue
@@ -11,7 +11,7 @@
         <div class="bbc-inner">
             <themeCompateHeader ref="brandRef" @del="handlerDel"></themeCompateHeader>
             <div class="mbc-inner">
-                <v-label-div title="主题分析">
+                <v-label-div title="主题列表">
                 </v-label-div>
                 <div class="card-outter">
                     <div v-for="(item, index) in myThemeArr" :key="index">
@@ -44,7 +44,8 @@
 </template>
 
 <script>
-import {getSchemeDataToTheme} from "@/api/ThemeAnalize"
+import {getSchemeDataToTheme} from "@/api/ThemeComparison"
+// import {getSchemeDataToTheme} from "@/api/ThemeAnalize"
 import themeCompateHeader from "./themeCompateHeader"
 export default {
     name: "BrandBeginComparte",
@@ -56,9 +57,6 @@ export default {
         return {
             form: {
                 token: "",
-                pageIndex: '',
-                pageSize: '',
-                sType: 'former' //former往期 now现在
             },
             chooseArr: [null, null, null, null, null, null],
             brands: [],
diff --git a/src/views/ThemeComparison/themeCompateHeader/index.vue b/src/views/ThemeComparison/themeCompateHeader/index.vue
index e57d733..32909a3 100644
--- a/src/views/ThemeComparison/themeCompateHeader/index.vue
+++ b/src/views/ThemeComparison/themeCompateHeader/index.vue
@@ -8,7 +8,7 @@
 -->
 <template>
     <div class="bc-d1">
-        <v-label-div title="品牌对比">
+        <v-label-div title="主题对比">
             <div>
                 <v-btn @click="reCompare">重选对比</v-btn>
                 <v-btn style="margin-left: 1rem" @click="goback">返回主题分析</v-btn>