From bb40bf0b03cb6278071d02fa11be87bef559454f Mon Sep 17 00:00:00 2001
From: liusiqian <liusiqian0826@163.com>
Date: Tue, 19 Jul 2022 15:27:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/infoShow/queryList.vue | 2 +-
 src/views/project/report/index.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/project/infoShow/queryList.vue b/src/views/project/infoShow/queryList.vue
index afad42f..ae4f80d 100644
--- a/src/views/project/infoShow/queryList.vue
+++ b/src/views/project/infoShow/queryList.vue
@@ -181,7 +181,7 @@
           width="400"
 
         />
-        <el-table-column label="类型" align="center" prop="type" width="120" :formatter="typeFormat" />
+        <el-table-column label="类型" align="left" prop="type" width="120" :formatter="typeFormat" />
         <el-table-column
           label="密级"
           align="left"
diff --git a/src/views/project/report/index.vue b/src/views/project/report/index.vue
index 700156a..6850a7e 100644
--- a/src/views/project/report/index.vue
+++ b/src/views/project/report/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dashboard-editor-container">
     <div class="card" style="">
-      <div class="" style="position: absolute;left: 20px; height:42px;">
+      <div class="" style="position: absolute;left: 20px; height:42px;top:0;bottom:0;margin:auto;">
         <span class="fontT" style="font-weight: bold">项目年份：</span>
 
         <el-radio-group v-model="yearRadio2" @change="changeList">

From ca30601bc50b87b12f5bb29c41b63408ceac5121 Mon Sep 17 00:00:00 2001
From: liusiqian <liusiqian0826@163.com>
Date: Wed, 20 Jul 2022 17:04:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/infoShow/queryList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/project/infoShow/queryList.vue b/src/views/project/infoShow/queryList.vue
index ae4f80d..8175712 100644
--- a/src/views/project/infoShow/queryList.vue
+++ b/src/views/project/infoShow/queryList.vue
@@ -111,9 +111,9 @@
           <el-radio-button label="32" border><span class="fontT">医药学部</span></el-radio-button>
           <el-radio-button label="33" border><span class="fontT">工管学部</span></el-radio-button>
           <el-radio-button label="149" border><span class="fontT">战略咨询中心</span></el-radio-button>
-          <el-radio-button label="998" border><span class="fontT">行业研究院</span></el-radio-button>
-          <el-radio-button label="999" border><span class="fontT">其他</span></el-radio-button>
+          <el-radio-button label="998" border><span class="fontT">行业研究院</span></el-radio-button>          
           <el-radio-button label="40" border><span class="fontT">地方研究院</span></el-radio-button>
+          <el-radio-button label="999" border><span class="fontT">其他</span></el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item label-width="100" prop="type">

From cb9397d6261119875e928e0c76c807ee14d3eb6e Mon Sep 17 00:00:00 2001
From: liusiqian <liusiqian0826@163.com>
Date: Tue, 26 Jul 2022 15:27:31 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/infoShow/queryList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project/infoShow/queryList.vue b/src/views/project/infoShow/queryList.vue
index 8175712..88d501e 100644
--- a/src/views/project/infoShow/queryList.vue
+++ b/src/views/project/infoShow/queryList.vue
@@ -166,7 +166,7 @@
         <el-table-column
           label="项目编号"
           align="left"
-          width="130"
+          width="140"
 
         >
           <template slot-scope="scope">

From d870d2f56296b5ae68c7ebd7da3a227c28ab60f1 Mon Sep 17 00:00:00 2001
From: liusiqian <liusiqian0826@163.com>
Date: Fri, 12 Aug 2022 10:12:42 +0800
Subject: [PATCH 4/4] path:

---
 src/layout/components/Navbar.vue         | 25 +++++++++++++++++++++---
 src/views/dashboard/BLYiTuoChart.vue     |  2 +-
 src/views/project/infoShow/queryList.vue |  5 +++--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 8dc3454..9fa6270 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -181,7 +181,7 @@ export default {
   data(){
     return {
       rolsArry:[],
-      buttonLink:'zxxm',
+      buttonLink:'',
       routerTitle:[
         {
           title:'home',
@@ -238,8 +238,27 @@ export default {
   methods: {
     ...mapMutations(['changeTitle']),
     getTitle(){
-     let title=storage.session.get('nowTitle')
-      this.buttonLink=title==null||title==undefined?'home':title;
+      let title=storage.session.get('nowTitle')
+      // this.buttonLink=title==null||title==undefined?'home':title;
+      let tempHref = window.location.href;
+      let index = tempHref.lastIndexOf("\/");
+      let str = (tempHref.substring(index + 1,tempHref.length)).split("?")[0];
+
+    //直接访问动态路由页时，没有buttonLink标识，需要通过url手动添加标识
+    if(str=='index') {
+      this.buttonLink = 'home'
+    } else if (str=='query'){
+      this.buttonLink = 'zxxm'
+    }else if (str=='adviseList'){
+      this.buttonLink = 'ysjy'
+    }else if (str=='resultList'){
+      this.buttonLink = 'bxcg'
+    }else if (str=='projectReport'){
+      this.buttonLink = 'zhst'
+    }else if (str=='copyInport'){
+      this.buttonLink = 'gltj'
+    }
+
       this.routerTitle.forEach(item=>{
         if (item.title==this.buttonLink){
           let yearRadio = null;
diff --git a/src/views/dashboard/BLYiTuoChart.vue b/src/views/dashboard/BLYiTuoChart.vue
index 38297c5..be84399 100644
--- a/src/views/dashboard/BLYiTuoChart.vue
+++ b/src/views/dashboard/BLYiTuoChart.vue
@@ -161,7 +161,7 @@ export default {
           lineOverflow : 'none'
         },
         grid: {
-          left: 10,
+          left: 12,
           right: 10,
           bottom: 30,
           top: 107,
diff --git a/src/views/project/infoShow/queryList.vue b/src/views/project/infoShow/queryList.vue
index 88d501e..10c93e7 100644
--- a/src/views/project/infoShow/queryList.vue
+++ b/src/views/project/infoShow/queryList.vue
@@ -208,7 +208,7 @@
           :formatter="statusFormat"
         />
 
-        <el-table-column label="成果" align="left" :show-overflow-tooltip="true" width="110" >
+        <el-table-column label="成果" align="left" :show-overflow-tooltip="true" width="115" >
           <!--        <template slot-scope="scope" v-if="scope.row.annexName != null">-->
           <template slot-scope="scope" v-if="scope.row.annexName != null &&scope.row.annexName != '[]'">
             <el-button
@@ -239,7 +239,7 @@
       append-to-body>
       <div style="margin-bottom: 20px;">
         <el-radio-group v-model="uploadProject.type">
-          <el-radio-button v-for="(item) in excelType" :label="item.value" :key="item.id" class="import-btn" >{{item.name}}</el-radio-button>
+          <el-radio-button v-for="(item) in excelType" :label="item.value" :key="item.id" class="import-btn" style="margin-bottom: 10px" >{{item.name}}</el-radio-button>
 
         </el-radio-group>
 
@@ -1261,6 +1261,7 @@
       color: #999 !important;
       font-size: 16px;
     }
+    
     .import-btn /deep/ .el-radio-button--medium .el-radio-button__inner{
       padding: 8.2px !important;
     }