diff --git a/src/views/activity/component/statistics/index.vue b/src/views/activity/component/statistics/index.vue
index 349d79e..6472f07 100644
--- a/src/views/activity/component/statistics/index.vue
+++ b/src/views/activity/component/statistics/index.vue
@@ -33,8 +33,8 @@
-
-
+
+
@@ -246,7 +246,6 @@ async function getwarnData() {
// 预警因子
const factorDataList = ref([])
-const factorNameList = ref([])
async function getFactoryData() {
const query = { batchNo, scaleId: scaleId.value }
let res = {}
@@ -262,8 +261,6 @@ async function getFactoryData() {
const factoryList = res.data
factoryList.forEach(item => {
- factorNameList.value.push(item.factorName)
-
const pieData = []
item.numList.forEach(numItem => {
pieData.push({
@@ -291,8 +288,24 @@ onMounted(() => {
getScalePublishList()
})
-function initPieOption(name = '', data) {
+function initPieOption(name = '', data = []) {
return {
+ title: {
+ text: name,
+ subtext: '',
+ x: 'center',
+ y: '10',
+ textStyle: {
+ color: '#95989D',
+ fontSize: 20,
+ lineHeight: 10,
+ },
+ subtextStyle: {
+ color: '#95989D',
+ fontSize: 16,
+ lineHeight: 10,
+ },
+ },
tooltip: {
trigger: 'item'
},
@@ -308,7 +321,7 @@ function initPieOption(name = '', data) {
data: data,
label: {
normal: {
- formatter: ['{c|{c}人}', '{b|{b}}'].join('\n'),
+ formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
rich: {
c: {
lineHeight: 5
diff --git a/src/views/archive/information/index.vue b/src/views/archive/information/index.vue
index a1e4c41..c5f556e 100644
--- a/src/views/archive/information/index.vue
+++ b/src/views/archive/information/index.vue
@@ -330,7 +330,7 @@ function handleExport(row: any) {
recordId: row.recordId,
userId: current.value.userId,
nickName: current.value.nickName
- }, `${current.value.nickName}.docx`)
+ }, `${current.value.nickName}.pdf`)
}
onMounted(() => {
diff --git a/src/views/archive/interveneRecord/index.vue b/src/views/archive/interveneRecord/index.vue
index ef2e23d..a9fb08f 100644
--- a/src/views/archive/interveneRecord/index.vue
+++ b/src/views/archive/interveneRecord/index.vue
@@ -332,7 +332,7 @@ function handleExport(row: any) {
recordId: row.recordId,
userId: current.value.userId,
nickName: current.value.nickName
- }, `${current.value.nickName}.docx`)
+ }, `${current.value.nickName}.pdf`)
}
onMounted(() => {
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 8f16aff..8246534 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -895,7 +895,7 @@ const rightPie2Option = ref({
roseType: 'radius',
label: {
normal: {
- formatter: ['{c|{c}人}', '{b|{b}}'].join('\n'),
+ formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
rich: {
c: {
color: 'rgb(241,246,104)',
diff --git a/src/views/evaluate/evaluateList/index.vue b/src/views/evaluate/evaluateList/index.vue
index 9309374..b23781b 100644
--- a/src/views/evaluate/evaluateList/index.vue
+++ b/src/views/evaluate/evaluateList/index.vue
@@ -38,7 +38,7 @@
-
+
{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}
@@ -65,7 +65,7 @@
+ v-hasPermi="['scale:publish:export']">
团体报告导出
@@ -201,7 +201,7 @@ const handlePublishExport = (row: any) => {
proxy?.download('scale/publish/export', {
batchNo, sessionName
- }, `团队报告-${sessionName}.docx`)
+ }, `团队报告-${sessionName}.pdf`)
}
diff --git a/src/views/index.vue b/src/views/index.vue
index 2a50f5d..85cba31 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -213,7 +213,7 @@ const leftPieOption = ref({
roseType: 'radius',
label: {
normal: {
- formatter: ['{c|{c}人}', '{b|{b}}'].join('\n'),
+ formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
rich: {
c: {
color: '#95989D',