From a5b6ae7f4b8aa3338136eb7d5e6c5010877303e0 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 27 May 2022 09:41:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../projectStatusBoard/index.vue              | 36 ++++++++++---------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 6448d8ce7..e7ff17155 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -894,4 +894,5 @@ module.exports = {
   basicInformation:'Basic Information',
   replyFromProjectContact:'Reply from project contact person',
   pleaseUpload:'Please Upload',
+  fullScreenView:'Full Screen View',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index f2a138480..5f9b01910 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -899,4 +899,5 @@ module.exports = {
   basicInformation:'基础信息',
   replyFromProjectContact:'工程接口人回复',
   pleaseUpload:'请上传',
+  fullScreenView:'全屏查看',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index b67d8d3d5..fb7955efe 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -34,6 +34,7 @@
     </div>
     <div class="box-top">
       <span class="box-top-text">{{$t('regulatoryCertificationTaskPlan')}}</span>
+      <span class="box-top-text fullScreenView" @click="TaskPlanListClick">{{$t('fullScreenView')}}</span>
       <span style="float: right" class="box-top-text-right">
            <a-range-picker
              :placeholder="[this.$t('startMonth'), this.$t('endMonth')]"
@@ -60,17 +61,20 @@
     </div>
     <div class="box-bottom">
       <span class="box-top-text">{{$t('projectStatusAndProgress')}}</span>
+      <span class="box-top-text fullScreenView" @click="projectNameClick">{{$t('fullScreenView')}}</span>
       <div>
         <a-table
           ref="table"
           size="middle"
           :loading="loading"
-          :customRow="projectNameClick"
           :pagination="false"
           :scroll="{x: true,y:500}"
           :data-source="dataSource"
           :columns="columns"
         >
+           <span slot="projectName" slot-scope="text" :title="text">
+                {{text && text.length > 10 ? text.slice(0,10)+'...':text}}
+           </span>
           <span slot="projectStatusTitle">
                <span>{{this.$t('projectStatus')}}</span><br/>
                <span>{{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+')'}}</span>
@@ -386,12 +390,12 @@
           axisTip.innerText = ''
           axisTip.style.display = 'none'
         })
-        myChart.on('click', (params) => {
-          let newUrl = this.$router.resolve({
-            path: '/TaskPlanList'
-          })
-          window.open(newUrl.href, '_blank')
+      },
+      TaskPlanListClick() {
+        let newUrl = this.$router.resolve({
+          path: '/TaskPlanList'
         })
+        window.open(newUrl.href, '_blank')
       },
       searchQuery() {
         this.getList()
@@ -413,16 +417,10 @@
         })
       },
       projectNameClick() {
-        return {
-          on: {
-            click: () => {
-              let newUrl = this.$router.resolve({
-                path: '/projectStatusAndProgress'
-              })
-              window.open(newUrl.href, '_blank')
-            }
-          }
-        }
+        let newUrl = this.$router.resolve({
+          path: '/projectStatusAndProgress'
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }
@@ -509,4 +507,10 @@
     width: 300px;
     margin-top: -4px;
   }
+
+  .fullScreenView {
+    margin-left: 16px;
+    color: #21c9cc;
+    cursor: pointer;
+  }
 </style>
\ No newline at end of file