From f89da954ca1b20514011ae3abbcfce829f4ac186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 27 Apr 2023 14:36:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE=E5=BA=93?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationActivity.vue      | 12 +++++++++-
 .../components/regulatoryCompliance.vue       | 13 ++++++++++-
 .../components/responsibilityList.vue         | 23 ++++++++++---------
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue
index a8033f9ba..0ba4406be 100644
--- a/jero-web/src/views/projectManagement/components/certificationActivity.vue
+++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue
@@ -246,7 +246,17 @@
             text: title
           },
           tooltip: {
-            trigger: 'item'
+            trigger: 'item',
+            textStyle : {
+              fontWeight : 'normal',
+              fontSize : 14,
+              color:'#040B29',
+              fontFamily:'BlueSkyNoto',
+            },
+            formatter: function (parms) {
+              let str = parms.marker+' '+parms.data.name+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+parms.data.value+' ('+parms.percent+'%)'
+              return str
+            }
           },
           legend: {
             itemWidth: 12,
diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
index a5164fc8a..f07000ca8 100644
--- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
+++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
@@ -98,7 +98,17 @@
             text: title
           },
           tooltip: {
-            trigger: 'item'
+            trigger: 'item',
+            textStyle : {
+              fontWeight : 'normal',
+              fontSize : 14,
+              color:'#040B29',
+              fontFamily:'BlueSkyNoto',
+            },
+            formatter: function (parms) {
+              let str = parms.marker+' '+parms.data.name+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+parms.data.value+' ('+parms.percent+'%)'
+              return str
+            }
           },
           legend: {
             itemWidth: 12,
@@ -287,6 +297,7 @@
       },
 
       responsibility(item) {
+        console.log(item)
         this.$emit('currentStatus', item)
       }
     }
diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue
index 7be4a77f8..16298c695 100644
--- a/jero-web/src/views/projectManagement/components/responsibilityList.vue
+++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue
@@ -27,9 +27,10 @@
                 :data-source="dataSource"
                 :columns="columns"
         >
-            <a slot="areaOfResponsibility" slot-scope="text,result" @click="areaOfResponsibilityClick(result)">
+<!--          @click="areaOfResponsibilityClick(result)"-->
+            <span slot="areaOfResponsibility" slot-scope="text,result">
                 {{text}}
-            </a>
+            </span>
         </a-table>
     </a-modal>
 </template>
@@ -59,7 +60,7 @@
             title: this.$t('areaOfResponsibility'),
             dataIndex: 'dutyTerritoryName',
             align: 'left',
-            width: 100,
+            width: 150,
             ellipsis: true,
             scopedSlots: { customRender: 'areaOfResponsibility' }
           },
@@ -107,14 +108,14 @@
       handleCancel() {
         this.visible = false
       },
-      areaOfResponsibilityClick(item) {
-        if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
-          this.queryParam.operatorType == 'queryDesignStatistics' ||
-          this.queryParam.operatorType == 'queryVerifyStatistics') {
-          item.isListing = '1'
-        }
-        this.$emit('responsibility', item)
-      }
+      // areaOfResponsibilityClick(item) {
+      //   if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
+      //     this.queryParam.operatorType == 'queryDesignStatistics' ||
+      //     this.queryParam.operatorType == 'queryVerifyStatistics') {
+      //     item.isListing = '1'
+      //   }
+      //   this.$emit('responsibility', item)
+      // }
     }
   }
 </script>