From d08143c7ca0bbd848e76c0c196413d04294e901a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Wed, 20 Mar 2024 15:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug=203.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/archives/updata.js                    |  8 ++++++++
 src/api/external/index.js                     |  2 +-
 src/views/components/MapCars.vue              |  4 ++--
 src/views/index.vue                           | 20 +++++++++++++------
 .../components/healthSon/QIxiehealthOne.vue   |  6 +++---
 .../components/healthSon/QIxiehealthThree.vue |  6 +++---
 .../components/healthSon/QixiehealthTow.vue   |  6 +++---
 .../components/healthSon/TiwaihealthOne.vue   |  6 +++---
 .../components/healthSon/TiwaihealthThree.vue |  6 +++---
 .../components/healthSon/TiwaihealthTow.vue   |  6 +++---
 .../components/healthSon/health.vue           |  6 +++---
 .../productsMsg/components/productInfo.vue    |  8 ++++----
 .../productsMsg/drugArchives/yaopinbapz.vue   |  6 +++---
 .../productsMsg/drugArchives/yaopinstscpz.vue |  4 ++--
 src/views/productsMsg/zyzj.vue                |  6 +++---
 vue.config.js                                 |  4 ++--
 16 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/src/api/archives/updata.js b/src/api/archives/updata.js
index 790e1ae..853b1de 100644
--- a/src/api/archives/updata.js
+++ b/src/api/archives/updata.js
@@ -29,6 +29,14 @@ export function dcyp(query) {
         responseType: 'blob'
     });
 }
+export function exportZyzj(query) {
+    return request({
+        url: "/pharmaceuticals/deasCorpTcmpFiling/exportZyzj",
+        method: "GET",
+        params: query,
+        responseType: 'blob'
+    });
+}
 //条件导出医疗器械数据
 export function dcylqx(query) {
     return request({
diff --git a/src/api/external/index.js b/src/api/external/index.js
index ba82bc3..527f619 100644
--- a/src/api/external/index.js
+++ b/src/api/external/index.js
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //获取用户信息
 export function getselfInfo() {
   return request({
-    // baseURL: location.origin,
+    baseURL: location.origin,
     url: "/api/admin/user/getSelfInfo",
     method: "GET",
   });
diff --git a/src/views/components/MapCars.vue b/src/views/components/MapCars.vue
index 8105fe8..2355279 100644
--- a/src/views/components/MapCars.vue
+++ b/src/views/components/MapCars.vue
@@ -20,10 +20,10 @@
             </div>
         </div>
         <div class="box" id="box">
-            <div class="box2" id="box2" v-show="collapsechange && echartstitle == '药品'">
+            <div class="box2" id="box2" v-show="collapsechange && echartstitle == '789798'">
                 <div class="echarts2" id="echarts2"></div>
             </div>
-            <div class="box2" id="box2" v-show="collapsechange && echartstitle == '药品'">
+            <div class="box2" id="box2" v-show="collapsechange && echartstitle == '789798'">
                 <div class="echarts3" id="echarts3"></div>
             </div>
         </div>
diff --git a/src/views/index.vue b/src/views/index.vue
index 9ee02bd..73a4b6a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -38,15 +38,15 @@
 
       </div>
       <div class="view-box">
+        
         <tags-view ref="tagsView" />
-        <div class="child-views">
-          <div class="view_box_title" v-show="$router.currentRoute.meta.title != '详情'">{{
+        <div class="view_box_title" v-show="$router.currentRoute.meta.title != '详情'">{{
       $router.currentRoute.meta.topTitle ||
       $router.currentRoute.meta.title }}</div>
+        <div class="child-views">
           <keep-alive>
             <router-view></router-view>
           </keep-alive>
-
         </div>
       </div>
     </div>
@@ -102,20 +102,24 @@ export default {
 
 ::v-deep .el-submenu__title {
   padding: 0 8px !important;
+  font-weight: bold !important;
 }
 
 ::v-deep .el-menu-item {
   padding: 0 8px !important;
   margin-right: -1px;
+
 }
 
 ::v-deep .el-menu-item-group .el-menu-item {
   align-items: center;
   margin-left: 20px !important;
+  font-weight: bold !important;
 }
 
 ::v-deep .el-menu-item-group__title {
   padding: 0 !important;
+  font-weight: bold;
 }
 
 .container {
@@ -259,20 +263,24 @@ export default {
 }
 
 .view_box_title {
-  width: 100%;
+  // width: 700px;
+  position: sticky;
+  top: 0;
+  width: 98.8%;
   height: 38px;
   line-height: 38px;
   text-align: center;
-  font-weight: 700;
   font-size: 19px;
   font-family: SourceHanSansCN;
   border-radius: 5px;
   color: #00356f;
-  margin: 0 0 10px 0;
+  margin: 10px 0 0 10px;
   background: url("../assets/images/sub-title.png");
   background-size: cover;
   background-position: center;
   background-repeat: no-repeat;
+  font-weight: bold;
+  z-index: 9999999;
 
 }
 
diff --git a/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue b/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue
index 57d0dd8..b3e5431 100644
--- a/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue
+++ b/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue
@@ -361,7 +361,7 @@
               </el-table-column>
               <el-table-column label="产品类型" prop="cplx" min-width="120" align="center"></el-table-column>
               <el-table-column label="产品管理类别" prop="cplb" min-width="160" align="center"></el-table-column>
-              <el-table-column label="所在地" prop="zcrszshi" min-width="120" align="center" sortable="custom">
+              <el-table-column label="所在地" prop="zcrszshi" min-width="150" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.zcrszshi }}
                 </template>
@@ -372,13 +372,13 @@
                   {{ zczt(scope.row.ppztDm) }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准日期" prop="pzrq" min-width="120" align="center" sortable="custom">
+              <el-table-column label="批准日期" prop="pzrq" min-width="170" align="center" sortable="custom">
 
                 <template slot-scope="scope">
                   {{ scope.row.pzrq.split(" ")[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准有效期至" prop="pzyxq" min-width="160" align="center" sortable="custom">
+              <el-table-column label="批准有效期至" prop="pzyxq" min-width="200" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzyxq ? scope.row.pzyxq.split(" ")[0] : "" }}
                 </template>
diff --git a/src/views/productsMsg/components/healthSon/QIxiehealthThree.vue b/src/views/productsMsg/components/healthSon/QIxiehealthThree.vue
index e1d142b..0e9adad 100644
--- a/src/views/productsMsg/components/healthSon/QIxiehealthThree.vue
+++ b/src/views/productsMsg/components/healthSon/QIxiehealthThree.vue
@@ -360,7 +360,7 @@
               </el-table-column>
               <el-table-column label="产品类型" prop="cplx" min-width="120" align="center"></el-table-column>
               <el-table-column label="产品管理类别" prop="cplb" min-width="160" align="center"></el-table-column>
-              <el-table-column label="所在地" prop="zcrszshi" min-width="120" align="center" sortable="custom">
+              <el-table-column label="所在地" prop="zcrszshi" min-width="150" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.zcrszshi }}
                 </template>
@@ -371,12 +371,12 @@
                   {{ zczt(scope.row.ppztDm) }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准日期" prop="pzrq" min-width="120" align="center" sortable="custom">
+              <el-table-column label="批准日期" prop="pzrq" min-width="170" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzrq.split(" ")[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准有效期至" prop="pzyxq" min-width="160" align="center" sortable="custom">
+              <el-table-column label="批准有效期至" prop="pzyxq" min-width="200" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzyxq ? scope.row.pzyxq.split(" ")[0] : "" }}
                 </template>
diff --git a/src/views/productsMsg/components/healthSon/QixiehealthTow.vue b/src/views/productsMsg/components/healthSon/QixiehealthTow.vue
index 549c8c0..4d732ab 100644
--- a/src/views/productsMsg/components/healthSon/QixiehealthTow.vue
+++ b/src/views/productsMsg/components/healthSon/QixiehealthTow.vue
@@ -361,7 +361,7 @@
               </el-table-column>
               <el-table-column label="产品类型" prop="cplx" min-width="120" align="center"></el-table-column>
               <el-table-column label="产品管理类别" prop="cplb" min-width="160" align="center"></el-table-column>
-              <el-table-column label="所在地" prop="zcrszshi" min-width="120" align="center" sortable="custom">
+              <el-table-column label="所在地" prop="zcrszshi" min-width="150" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.zcrszshi }}
                 </template>
@@ -372,13 +372,13 @@
                   {{ zczt(scope.row.ppztDm) }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准日期" prop="pzrq" min-width="120" align="center" sortable="custom">
+              <el-table-column label="批准日期" prop="pzrq" min-width="170" align="center" sortable="custom">
 
                 <template slot-scope="scope">
                   {{ scope.row.pzrq.split(" ")[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准有效期至" prop="pzyxq" min-width="160" align="center" sortable="custom">
+              <el-table-column label="批准有效期至" prop="pzyxq" min-width="200" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzyxq ? scope.row.pzyxq.split(" ")[0] : "" }}
                 </template>
diff --git a/src/views/productsMsg/components/healthSon/TiwaihealthOne.vue b/src/views/productsMsg/components/healthSon/TiwaihealthOne.vue
index df84edc..2c6b5a6 100644
--- a/src/views/productsMsg/components/healthSon/TiwaihealthOne.vue
+++ b/src/views/productsMsg/components/healthSon/TiwaihealthOne.vue
@@ -360,7 +360,7 @@
               </el-table-column>
               <el-table-column label="产品类型" prop="cplx" min-width="120" align="center"></el-table-column>
               <el-table-column label="产品管理类别" prop="cplb" min-width="160" align="center"></el-table-column>
-              <el-table-column label="所在地" prop="zcrszshi" min-width="120" align="center" sortable="custom">
+              <el-table-column label="所在地" prop="zcrszshi" min-width="150" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.zcrszshi }}
                 </template>
@@ -371,13 +371,13 @@
                   {{ zczt(scope.row.ppztDm) }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准日期" prop="pzrq" min-width="120" align="center" sortable="custom">
+              <el-table-column label="批准日期" prop="pzrq" min-width="170" align="center" sortable="custom">
 
                 <template slot-scope="scope">
                   {{ scope.row.pzrq.split(" ")[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准有效期至" prop="pzyxq" min-width="160" align="center" sortable="custom">
+              <el-table-column label="批准有效期至" prop="pzyxq" min-width="200" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzyxq ? scope.row.pzyxq.split(" ")[0] : "" }}
                 </template>
diff --git a/src/views/productsMsg/components/healthSon/TiwaihealthThree.vue b/src/views/productsMsg/components/healthSon/TiwaihealthThree.vue
index 084353b..26085fe 100644
--- a/src/views/productsMsg/components/healthSon/TiwaihealthThree.vue
+++ b/src/views/productsMsg/components/healthSon/TiwaihealthThree.vue
@@ -360,7 +360,7 @@
               </el-table-column>
               <el-table-column label="产品类型" prop="cplx" min-width="120" align="center"></el-table-column>
               <el-table-column label="产品管理类别" prop="cplb" min-width="160" align="center"></el-table-column>
-              <el-table-column label="所在地" prop="zcrszshi" min-width="120" align="center" sortable="custom">
+              <el-table-column label="所在地" prop="zcrszshi" min-width="150" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.zcrszshi }}
                 </template>
@@ -371,12 +371,12 @@
                   {{ zczt(scope.row.ppztDm) }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准日期" prop="pzrq" min-width="120" align="center" sortable="custom">
+              <el-table-column label="批准日期" prop="pzrq" min-width="170" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzrq.split(" ")[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准有效期至" prop="pzyxq" min-width="160" align="center" sortable="custom">
+              <el-table-column label="批准有效期至" prop="pzyxq" min-width="200" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzyxq ? scope.row.pzyxq.split(" ")[0] : "" }}
                 </template>
diff --git a/src/views/productsMsg/components/healthSon/TiwaihealthTow.vue b/src/views/productsMsg/components/healthSon/TiwaihealthTow.vue
index 932edc6..71e58c0 100644
--- a/src/views/productsMsg/components/healthSon/TiwaihealthTow.vue
+++ b/src/views/productsMsg/components/healthSon/TiwaihealthTow.vue
@@ -360,7 +360,7 @@
               </el-table-column>
               <el-table-column label="产品类型" prop="cplx" min-width="120" align="center"></el-table-column>
               <el-table-column label="产品管理类别" prop="cplb" min-width="160" align="center"></el-table-column>
-              <el-table-column label="所在地" prop="zcrszshi" min-width="120" align="center" sortable="custom">
+              <el-table-column label="所在地" prop="zcrszshi" min-width="150" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.zcrszshi }}
                 </template>
@@ -370,12 +370,12 @@
                   {{ zczt(scope.row.ppztDm) }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准日期" prop="pzrq" min-width="120" align="center" sortable="custom">
+              <el-table-column label="批准日期" prop="pzrq" min-width="170" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzrq.split(" ")[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准有效期至" prop="pzyxq" min-width="160" align="center" sortable="custom">
+              <el-table-column label="批准有效期至" prop="pzyxq" min-width="200" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzyxq ? scope.row.pzyxq.split(" ")[0] : "" }}
                 </template>
diff --git a/src/views/productsMsg/components/healthSon/health.vue b/src/views/productsMsg/components/healthSon/health.vue
index ebb7d8c..d83362c 100644
--- a/src/views/productsMsg/components/healthSon/health.vue
+++ b/src/views/productsMsg/components/healthSon/health.vue
@@ -363,7 +363,7 @@
               </el-table-column>
               <el-table-column label="产品类型" prop="cplx" min-width="120" align="center"></el-table-column>
               <el-table-column label="产品管理类别" prop="cplb" min-width="160" align="center"></el-table-column>
-              <el-table-column label="所在地" prop="zcrszshi" min-width="120" align="center" sortable="custom">
+              <el-table-column label="所在地" prop="zcrszshi" min-width="150" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.zcrszshi }}
                 </template>
@@ -374,12 +374,12 @@
                 </template>
               </el-table-column>
 
-              <el-table-column label="批准日期" prop="pzrq" min-width="120" align="center" sortable="custom">
+              <el-table-column label="批准日期" prop="pzrq" min-width="170" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzrq ? scope.row.pzrq.split(" ")[0] : "" }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准有效期至" prop="pzyxq" min-width="160" align="center" sortable="custom">
+              <el-table-column label="批准有效期至" prop="pzyxq" min-width="200" align="center" sortable="custom">
                 <template slot-scope="scope">
                   {{ scope.row.pzyxq ? scope.row.pzyxq.split(" ")[0] : "" }}
                 </template>
diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue
index 72a7540..b080578 100644
--- a/src/views/productsMsg/components/productInfo.vue
+++ b/src/views/productsMsg/components/productInfo.vue
@@ -43,12 +43,12 @@ export default {
   },
   activated() {
     this.$nextTick(() => {
-      // this.Url = `${location.origin}/ggfw-iframe/#/productinformation?type=${this.$route.query.type
-      //   }&flag=${this.$route.query.flag}&data=${this.$route.query.data
-      //   }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}`
-      this.Url = `http://localhost:82?type=${this.$route.query.type
+      this.Url = `${location.origin}/ggfw-iframe/#/productinformation?type=${this.$route.query.type
         }&flag=${this.$route.query.flag}&data=${this.$route.query.data
         }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}`
+      // this.Url = `http://localhost:82?type=${this.$route.query.type
+      //   }&flag=${this.$route.query.flag}&data=${this.$route.query.data
+      //   }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}`
         
       let dom = document.getElementsByClassName("ifram-view");
       let height = dom[0].getBoundingClientRect();
diff --git a/src/views/productsMsg/drugArchives/yaopinbapz.vue b/src/views/productsMsg/drugArchives/yaopinbapz.vue
index b213a0c..5b55b80 100644
--- a/src/views/productsMsg/drugArchives/yaopinbapz.vue
+++ b/src/views/productsMsg/drugArchives/yaopinbapz.vue
@@ -173,13 +173,13 @@
                   {{ scope.row.scqy }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准日期" min-width="140" align="center" :sortable="sortableshow">
+              <el-table-column label="批准日期" min-width="170" align="center" :sortable="sortableshow">
 
                 <template slot-scope="scope">
                   {{ scope.row.pzrq }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准文号期限" min-width="170" align="center" :sortable="sortableshow">
+              <el-table-column label="批准文号期限" min-width="200" align="center" :sortable="sortableshow">
 
                 <template slot-scope="scope">
                   {{ scope.row.yppzwhyxq }}
@@ -192,7 +192,7 @@
                   <div class="norepet">{{ scope.row.scdz }}</div>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="180" fixed="right" align="center">
+              <el-table-column label="操作" width="200" fixed="right" align="center">
                 <template slot-scope="scope">
                   <el-button type="primary" @click="toDetail(scope.row, 1)">详情</el-button>
                   <el-button type="primary" @click="mygotohuaxiang(scope.row, 1)">产品画像</el-button>
diff --git a/src/views/productsMsg/drugArchives/yaopinstscpz.vue b/src/views/productsMsg/drugArchives/yaopinstscpz.vue
index bed53e6..0bb8462 100644
--- a/src/views/productsMsg/drugArchives/yaopinstscpz.vue
+++ b/src/views/productsMsg/drugArchives/yaopinstscpz.vue
@@ -154,13 +154,13 @@
                                     {{ scope.row.scqy }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="批准日期" min-width="140" align="center" sortable="custom">
+                            <el-table-column label="批准日期" min-width="170" align="center" sortable="custom">
 
                                 <template slot-scope="scope">
                                     {{ scope.row.pzrq }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="批准文号期限" min-width="180" align="center" sortable="custom">
+                            <el-table-column label="批准文号期限" min-width="200" align="center" sortable="custom">
 
                                 <template slot-scope="scope">
                                     {{ scope.row.yppzwhyxq }}
diff --git a/src/views/productsMsg/zyzj.vue b/src/views/productsMsg/zyzj.vue
index 5e3b736..5e05e5c 100644
--- a/src/views/productsMsg/zyzj.vue
+++ b/src/views/productsMsg/zyzj.vue
@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import { download, dcyp } from "../../api/archives/updata";
+import { download, dcyp,exportZyzj } from "../../api/archives/updata";
 import { Notification, MessageBox, Message, Loading } from "element-ui";
 import MapCars from "@/views/components/MapCarsLog.vue";
 import dishi from "@/views/components/AdvancedSearch/dishi.vue";
@@ -237,12 +237,12 @@ export default {
         spinner: "el-icon-loading",
         background: "rgba(0, 0, 0, 0.7)",
       });
-      dcyp(this.form1).then((res) => {
+      exportZyzj(this.form1).then((res) => {
         const blob = new Blob([res], { type: res.type });
         const link = document.createElement("a");
         link.href = window.URL.createObjectURL(blob);
         link.style.display = "none";
-        link.download = "药品" + ".xlsx";
+        link.download = "中药制剂" + ".xlsx";
         link.click();
         this.loadA.close();
         this.$message({
diff --git a/vue.config.js b/vue.config.js
index 863221b..2fb70ca 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -42,9 +42,9 @@ module.exports = {
     open: true,
     proxy: {
       "/configApi": {
-        // target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api",
+        target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api",
         // target: "http://172.24.20.196/ggfw-api",
-        target: "http://192.168.0.111:9023/ggfw-api",
+        // target: "http://192.168.0.111:9023/ggfw-api",
         
         changeOrigin: true,
         pathRewrite: {