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+'        '+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+'        '+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" > - + + {{text}} - + @@ -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) + // } } }