From 2bc6429156e1c7160abda88cac9b2362414d68dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Fri, 5 Nov 2021 15:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=A6=96=E9=A1=B5=E8=A7=A3?=
 =?UTF-8?q?=E8=AF=BB=E6=A3=80=E7=B4=A2=EF=BC=8C=E6=9B=B4=E5=A4=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8D=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/home.vue | 12 +++++-------
 src/views/portrait.vue  |  4 ++++
 src/views/result.vue    | 17 +++++++++++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index 2f55ca9..b464221 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -31,7 +31,7 @@
             <div class="tab_list">
               <!-- @tab-click="handleClick2" -->
               <el-tabs v-model="queryParams2.attributeId">
-                <el-tab-pane label="科技" name="KJJ">
+                <!-- <el-tab-pane label="科技" name="KJJ">
                   <span
                     slot="label"
                     @mouseover="
@@ -66,7 +66,7 @@
                     "
                     >其他</span
                   >
-                </el-tab-pane>
+                </el-tab-pane> -->
                 <div
                   class="tab_item"
                   style="position: relative;padding-right:50px"
@@ -74,9 +74,7 @@
                   :key="item.id"
                 >
                   <span :class="index < 3 ? 'color' : ''"></span>
-                  <!-- <span class="text_hidden_one text_18_333 pointer">{{
-                    item.title
-                  }}</span> -->
+
                   <span class="text_hidden_one text_18_333 pointer">
                     <router-link
                       target="_blank"
@@ -494,8 +492,8 @@ export default {
         pageSize: 7
       },
       queryParams2: {
-        attributeId: 'KJJ',
-        pageSize: 7
+        attributeId: 'OTHER',
+        pageSize: 8
       },
       queryParams3: {
         pageNum: 1,
diff --git a/src/views/portrait.vue b/src/views/portrait.vue
index b9c0051..80c506a 100644
--- a/src/views/portrait.vue
+++ b/src/views/portrait.vue
@@ -156,6 +156,10 @@ export default {
       ],
       // 归口选项
       attributeOptions: [
+        {
+          value: '',
+          label: '不限'
+        },
         {
           value: 'KJJ',
           label: '科技'
diff --git a/src/views/result.vue b/src/views/result.vue
index 2ef5611..118a235 100644
--- a/src/views/result.vue
+++ b/src/views/result.vue
@@ -77,7 +77,11 @@
         <!-- <div v-html="formData.text"></div> -->
         <div
           id="text"
-          :class="type == 'policy' && formData.method == 1 ? '' : 'ql-editor'"
+          :class="
+            (type == 'policy' && formData.method == 1) || type == 'policyRead'
+              ? ''
+              : 'ql-editor'
+          "
         >
           <!-- <editor v-model="formData.text" :min-height="192" /> -->
           <div v-html="formData.text" />
@@ -165,9 +169,13 @@ export default {
   watch: {
     formData: {
       handler: function() {
-        if (this.type == 'policy') {
+        if (this.type == 'policy' || this.type == 'policyRead') {
           this.$nextTick(() => {
-            this.formatRichText(this.formData.downloadUrl, this.formData.id);
+            this.formatRichText(
+              this.formData.downloadUrl,
+              this.formData.id,
+              this.formData.url
+            );
           });
         } else {
           this.formData.text = this.formData.text.replaceAll('&nbsp;', '　');
@@ -263,7 +271,8 @@ export default {
     /deep/.editor {
       border: 0;
     }
-    /deep/p {
+    /deep/p,
+    /deep/#zoom {
       img {
         max-width: 100%;
       }