From d40cb943efff4cbc2d2b3fde9d2e7e6513b1ef8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=8E=E7=BB=A7=E7=BB=AD=E5=90=B9?= <17611323298@163.com>
Date: Tue, 14 Mar 2023 16:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/http.js              | 11 +++++++++++
 src/page/check/chose.vue             | 15 ++++++++++-----
 src/views/Receive/index.vue          | 14 ++++++++++----
 src/views/Template/Pinspeakwords.vue |  2 +-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/api/modules/http.js b/src/api/modules/http.js
index b481463..bfa3f82 100644
--- a/src/api/modules/http.js
+++ b/src/api/modules/http.js
@@ -712,6 +712,17 @@ export function findBannedWordsByCusId(query) {
   })
 }
 
+// 获取销讲违禁执行
+export function findBycusId(query) {
+  return request({
+    url: 'autoSR/template/findBycusId',
+    method:'get',
+    params:query
+  })
+}
+
+// 
+
 // 标记顾问
 export function markConsultant(query) {
   return request({
diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue
index 88b5eb2..b4f6a5f 100644
--- a/src/page/check/chose.vue
+++ b/src/page/check/chose.vue
@@ -178,7 +178,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
-        page-sizes="[15]"
+        :page-sizes="[10]"
         :page-size="size"
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
@@ -234,8 +234,8 @@ export default {
       propertyName: "",
       agentName: "", //代理商名称
       companyName: "",
-      total: 20,
-      size: 15,
+      total: 0,
+      size: 10,
       list: [],
       options: [],
       info: {},
@@ -260,6 +260,11 @@ export default {
       this.findByUserName();
     }
   },
+  watch: {
+    total(newV, oldV) {
+      console.log(newV, oldV)
+    }
+  },
   computed: {},
   methods: {
     // 获取代理商
@@ -271,7 +276,7 @@ export default {
           agentName: this.agentName,
         })
         .then((res) => {
-          console.log(res);
+          console.log(res, 'daskj');
           this.list = res.data.records;
           this.total = res.data.total;
         });
@@ -311,7 +316,7 @@ export default {
           orgType: localStorage.getItem("orgType"),
         })
         .then((res) => {
-          console.log(res);
+          console.log(res, 'dadksladkasl;slkdl');
           this.list = res.data.records;
           this.total = res.data.total;
         });
diff --git a/src/views/Receive/index.vue b/src/views/Receive/index.vue
index c1e7203..2a42bac 100644
--- a/src/views/Receive/index.vue
+++ b/src/views/Receive/index.vue
@@ -644,6 +644,8 @@
           style="height: calc(70vh - 230px)"
           v-if="zhixingcenterindex == 2"
         >
+          <div style="flex-grow: 1;">
+
           <div
             style="width: 100%"
             v-for="(item, index) in keyWordsList"
@@ -806,6 +808,7 @@
               </div>
             </div>
           </div>
+          </div>
           <div class="mydesc" v-if="zhixingcenterindex == 2">
             <span style="color: #409eff"
               ><i class="el-icon-success" style="margin-right: 5px"></i
@@ -2212,6 +2215,8 @@ export default {
           } else {
             this.kehuyixiangcenterindex = 1;
           }
+
+          this.prohibitedlist = JSON.parse(res.data.sensitiveWords) || [];
           this.findCARKeywords();
           this.findBannedWordsByCusId();
           this.Getsthetransliteratecontent();
@@ -2314,10 +2319,9 @@ export default {
     //获取销讲词违禁词
     findBannedWordsByCusId() {
       this.$api.http
-        .findBannedWordsByCusId({ cusId: this.fileId })
+        .findBycusId({ cusId: this.fileId })
         .then((res) => {
-          let list1 = res.data.SalesTalk || [];
-          let list2 = res.data.ProhibitedWords || [];
+          let list1 = res.data || [];
           let level1 = []; // 一级
           list1.forEach((item) => {
             if (item.pid == 0) {
@@ -2351,7 +2355,6 @@ export default {
             level1[0].show = true;
           }
           this.ratelist = level1;
-          this.prohibitedlist = list2;
         });
     },
 
@@ -2771,6 +2774,7 @@ export default {
 }
 
 .mydesc {
+  flex-shrink: 0;
   position: sticky;
   bottom: 0;
   padding: 0 10px;
@@ -2827,6 +2831,8 @@ export default {
   // padding-bottom: 50px;
   overflow-y: scroll;
   position: relative;
+  display: flex;
+  flex-direction: column;
 }
 
 .biaotibox {
diff --git a/src/views/Template/Pinspeakwords.vue b/src/views/Template/Pinspeakwords.vue
index 69cb848..aab33f8 100644
--- a/src/views/Template/Pinspeakwords.vue
+++ b/src/views/Template/Pinspeakwords.vue
@@ -491,7 +491,7 @@ export default {
       });
     },
     // 递归获取所有的ID
-    getAllTreeListId(arr) {
+    getAllTreeListId(arr) {  
       const setSelected = (arr) => {
         arr.forEach((item) => {
           this.allTreeListId.push(item.id);