From d903e6402c585c0a82c62546e4ec19667a49519c Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Thu, 27 Apr 2023 14:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/table.js                    |  2 +-
 src/views/Home/HealthPopularization/index.vue | 37 +++++++++++++++----
 src/views/Home/PdfView/index.vue              |  2 +-
 src/views/Home/ScientificResearch/index.vue   |  1 +
 .../components/AcademicTrend.vue              |  5 ++-
 .../components/HealthPopularization.vue       | 11 ++++--
 .../components/NewsMeeting.vue                |  5 ++-
 .../components/NoticeAnnouncement.vue         |  5 ++-
 .../components/TypicalCase.vue                |  5 ++-
 .../operation-management/components/mixin.js  |  7 ++--
 .../components/scientificResearch.vue         | 11 ++++--
 src/views/systems/user/index.vue              |  2 +
 12 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/src/store/modules/table.js b/src/store/modules/table.js
index ed50400..09bc33f 100644
--- a/src/store/modules/table.js
+++ b/src/store/modules/table.js
@@ -1,5 +1,5 @@
 const state = {
-  fontSize: localStorage.getItem("fontSize") || 1,
+  fontSize: localStorage.getItem("fontSize") || 14,
   selectedIndex: sessionStorage.getItem("selectedIndex") || "",
   refreshFlag: 0,
 }
diff --git a/src/views/Home/HealthPopularization/index.vue b/src/views/Home/HealthPopularization/index.vue
index 3a0e093..427f01e 100644
--- a/src/views/Home/HealthPopularization/index.vue
+++ b/src/views/Home/HealthPopularization/index.vue
@@ -14,7 +14,7 @@
       <div class="list_title">
         {{ leftBar[activeBar].name }}
       </div>
-      <ul class="list" v-if="tableData.length > 0">
+      <ul v-if="tableData.length > 0" class="list">
         <li v-for="(item, index) in tableData" :key="index">
           <div class="leftImg">
             <img
@@ -62,14 +62,19 @@
           {{ item }}<span v-if="index != showTitle.length - 1"> / </span>
         </div>
       </div>
-      {{ showText }}
+      <div class="refuteList">
+        <!-- <pdf :src="pdfSrc"></pdf> -->
+        <pdf-view ref="pdfView" :pdf-url="pdfSrc"></pdf-view>
+      </div>
     </div>
   </div>
 </template>
 <script>
 import { articleList } from "@/api/operation-management"
+import PdfView from "../PdfView/index"
 import paginationMixin from "@/components/TabComponents/mixin"
 export default {
+  components: { PdfView },
   mixins: [paginationMixin],
   data() {
     return {
@@ -89,7 +94,7 @@ export default {
           name: "其他",
         },
       ],
-      showText: "",
+      pdfSrc: "",
       showTitle: [],
       showDetail: false,
       // 分页数据
@@ -97,6 +102,15 @@ export default {
       tableData: [],
     }
   },
+  watch: {
+    showDetail(v) {
+      if (v) {
+        setTimeout(() => {
+          this.$refs.pdfView.loadPDF()
+        }, 250)
+      }
+    },
+  },
   mounted() {
     console.log(this.$route)
     if (this.$route.query.tabIndex) {
@@ -112,6 +126,7 @@ export default {
         size: this.pageSize,
         current: this.pageIndex,
         moduleType: "4",
+        status: "1",
         articleType: this.activeBar - 0 + 1,
       }
       articleList(params)
@@ -129,19 +144,23 @@ export default {
     changeActive(i) {
       this.activeBar = i
       this.showDetail = false
-      this.showText = ""
+      this.pdfSrc = ""
       this.getArticleList()
     },
     viewDetail(i) {
       this.showDetail = true
-      this.showText = this.tableData[i].articleContent
+      this.pdfSrc =
+        "https://ds.cixincloud.com/geca-api/disease-data/file/info/" +
+        this.tableData[i].filePath[0].bucketName +
+        "/" +
+        this.tableData[i].filePath[0].uuidName
       this.showTitle[0] = this.leftBar[this.activeBar].name
       this.showTitle[1] = this.tableData[i].articleTitle
-      console.log(this.showText)
+      console.log(this.pdfSrc)
     },
     back(index) {
       if (index == 0) {
-        this.showText = ""
+        this.pdfSrc = ""
         this.showDetail = false
       }
     },
@@ -268,4 +287,8 @@ export default {
     font-family: AlibabaPuHuiTiR;
   }
 }
+.refuteList {
+  height: 100%;
+  // overflow: auto;
+}
 </style>
diff --git a/src/views/Home/PdfView/index.vue b/src/views/Home/PdfView/index.vue
index b54d024..c6ea396 100644
--- a/src/views/Home/PdfView/index.vue
+++ b/src/views/Home/PdfView/index.vue
@@ -199,7 +199,7 @@ export default {
     left: 0;
     right: 0;
     padding: 10px 0;
-    background-color: rgba(255, 255, 255, 0.5);
+    background-color: rgba(255, 255, 255, 1);
     .info {
       display: flex;
       flex-wrap: wrap;
diff --git a/src/views/Home/ScientificResearch/index.vue b/src/views/Home/ScientificResearch/index.vue
index d6dc817..ee8286c 100644
--- a/src/views/Home/ScientificResearch/index.vue
+++ b/src/views/Home/ScientificResearch/index.vue
@@ -103,6 +103,7 @@ export default {
         size: this.pageSize,
         current: this.pageIndex,
         moduleType: "5",
+        status: "1",
         articleType: this.activeBar - 0 + 1,
       }
       articleList(params)
diff --git a/src/views/systems/operation-management/components/AcademicTrend.vue b/src/views/systems/operation-management/components/AcademicTrend.vue
index 3e4ccd5..eaff434 100644
--- a/src/views/systems/operation-management/components/AcademicTrend.vue
+++ b/src/views/systems/operation-management/components/AcademicTrend.vue
@@ -6,6 +6,7 @@
     <div class="bot-table">
       <customs-table
         ref="table"
+        :max-height="780"
         :table-data="tableData"
         :columns="columns"
         :header-class="'newHeader'"
@@ -223,11 +224,11 @@ export default {
   },
   watch: {},
   mounted() {
-    this.getArticleList()
+    this.handleSearch()
   },
   methods: {
     // 获取新闻会议
-    getArticleList() {
+    handleSearch() {
       this.listLoading = true
       let params = {
         size: this.pageSize,
diff --git a/src/views/systems/operation-management/components/HealthPopularization.vue b/src/views/systems/operation-management/components/HealthPopularization.vue
index 261e4c0..48e3362 100644
--- a/src/views/systems/operation-management/components/HealthPopularization.vue
+++ b/src/views/systems/operation-management/components/HealthPopularization.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="medicalunion-management">
     <div class="top-btn">
-      <el-select v-model="selectType" @change="getArticleList">
+      <el-select v-model="selectType" @change="beforeSearch">
         <el-option
           v-for="item in selectList"
           :key="item.value"
@@ -17,6 +17,7 @@
         ref="table"
         :table-data="tableData"
         :columns="columns"
+        :max-height="780"
         :header-class="'newHeader'"
         :list-loading="listLoading"
         :current-page="pageIndex"
@@ -291,11 +292,15 @@ export default {
   },
   watch: {},
   mounted() {
-    this.getArticleList()
+    this.handleSearch()
   },
   methods: {
     // 获取健康科普
-    getArticleList() {
+    beforeSearch() {
+      this.pageIndex = 1
+      this.handleSearch()
+    },
+    handleSearch() {
       this.listLoading = true
       let params = {
         size: this.pageSize,
diff --git a/src/views/systems/operation-management/components/NewsMeeting.vue b/src/views/systems/operation-management/components/NewsMeeting.vue
index 113958c..a76e2e1 100644
--- a/src/views/systems/operation-management/components/NewsMeeting.vue
+++ b/src/views/systems/operation-management/components/NewsMeeting.vue
@@ -14,6 +14,7 @@
         :total-count="total"
         :page-sizes="pageSizes"
         :page-size="pageSize"
+        :max-height="780"
         @pageSizeChange="handleSizeChange"
         @currentPageChange="handleCurrentChange"
       />
@@ -223,11 +224,11 @@ export default {
   },
   watch: {},
   mounted() {
-    this.getArticleList()
+    this.handleSearch()
   },
   methods: {
     // 获取新闻会议
-    getArticleList() {
+    handleSearch() {
       this.listLoading = true
       let params = {
         size: this.pageSize,
diff --git a/src/views/systems/operation-management/components/NoticeAnnouncement.vue b/src/views/systems/operation-management/components/NoticeAnnouncement.vue
index 04837e6..baed2ae 100644
--- a/src/views/systems/operation-management/components/NoticeAnnouncement.vue
+++ b/src/views/systems/operation-management/components/NoticeAnnouncement.vue
@@ -15,6 +15,7 @@
         :page-sizes="pageSizes"
         :page-size="pageSize"
         @pageSizeChange="handleSizeChange"
+        :max-height="780"
         @currentPageChange="handleCurrentChange"
       />
     </div>
@@ -223,11 +224,11 @@ export default {
   },
   watch: {},
   mounted() {
-    this.getArticleList()
+    this.handleSearch()
   },
   methods: {
     // 获取新闻会议
-    getArticleList() {
+    handleSearch() {
       this.listLoading = true
       let params = {
         size: this.pageSize,
diff --git a/src/views/systems/operation-management/components/TypicalCase.vue b/src/views/systems/operation-management/components/TypicalCase.vue
index 7b4e9a2..ea08c39 100644
--- a/src/views/systems/operation-management/components/TypicalCase.vue
+++ b/src/views/systems/operation-management/components/TypicalCase.vue
@@ -12,6 +12,7 @@
         :list-loading="listLoading"
         :current-page="pageIndex"
         :total-count="total"
+        :max-height="780"
         :page-sizes="pageSizes"
         :page-size="pageSize"
         @pageSizeChange="handleSizeChange"
@@ -223,11 +224,11 @@ export default {
   },
   watch: {},
   mounted() {
-    this.getArticleList()
+    this.handleSearch()
   },
   methods: {
     // 获取新闻会议
-    getArticleList() {
+    handleSearch() {
       this.listLoading = true
       let params = {
         size: this.pageSize,
diff --git a/src/views/systems/operation-management/components/mixin.js b/src/views/systems/operation-management/components/mixin.js
index 400116d..125f916 100644
--- a/src/views/systems/operation-management/components/mixin.js
+++ b/src/views/systems/operation-management/components/mixin.js
@@ -44,7 +44,7 @@ const mixin = {
       articleEnable(params).then((res) => {
         if (res.code == 1) {
           // this.$message.success("保存成功")
-          this.getArticleList()
+          this.handleSearch()
         }
       })
     },
@@ -67,7 +67,8 @@ const mixin = {
               this.form = {
                 status: 1,
               }
-              this.getArticleList()
+              this.pageIndex = 1
+              this.handleSearch()
             }
           })
         } else {
@@ -89,7 +90,7 @@ const mixin = {
         .then((res) => {
           if (res.code == 1) {
             this.$message.success("删除成功")
-            this.getArticleList()
+            this.handleSearch()
           }
         })
         .catch(() => {})
diff --git a/src/views/systems/operation-management/components/scientificResearch.vue b/src/views/systems/operation-management/components/scientificResearch.vue
index cfc4410..4d51200 100644
--- a/src/views/systems/operation-management/components/scientificResearch.vue
+++ b/src/views/systems/operation-management/components/scientificResearch.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="medicalunion-management">
     <div class="top-btn">
-      <el-select v-model="selectType" @change="getArticleList">
+      <el-select v-model="selectType" @change="beforeSearch">
         <el-option
           v-for="item in selectList"
           :key="item.value"
@@ -17,6 +17,7 @@
         ref="table"
         :table-data="tableData"
         :columns="columns"
+        :max-height="780"
         :header-class="'newHeader'"
         :list-loading="listLoading"
         :current-page="pageIndex"
@@ -277,11 +278,15 @@ export default {
   },
   watch: {},
   mounted() {
-    this.getArticleList()
+    this.handleSearch()
   },
   methods: {
+    beforeSearch() {
+      this.pageIndex = 1
+      this.handleSearch()
+    },
     // 获取健康科普
-    getArticleList() {
+    handleSearch() {
       this.listLoading = true
       let params = {
         size: this.pageSize,
diff --git a/src/views/systems/user/index.vue b/src/views/systems/user/index.vue
index 16e4dd5..c4c28a2 100644
--- a/src/views/systems/user/index.vue
+++ b/src/views/systems/user/index.vue
@@ -345,12 +345,14 @@ export default {
           spanCount: 12,
           prop: "orgId",
           opts: orgList,
+          rules: [{ required: true, message: "请选择机构" }],
           func: this.orgChange,
         },
         {
           type: "select",
           label: "科室",
           spanCount: 12,
+          rules: [{ required: true, message: "请选择科室" }],
           prop: "deptId",
           opts: [],
         },
-- 
2.22.0