Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<TableHeader datePicker area showExport>
|
||||
<template #select>
|
||||
<el-form-item label="筛选数据">
|
||||
<el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" />
|
||||
<el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" clearable maxlength="32" show-word-limit/>
|
||||
</el-form-item>
|
||||
<el-form-item label="统计类型:">
|
||||
<el-select
|
||||
|
||||
@@ -181,9 +181,10 @@ const init = () => {
|
||||
]
|
||||
if (searchType.value) {
|
||||
series.push({
|
||||
name: formData.periodBeginTime + '至' + formData.periodEndTime,
|
||||
name: formData.periodBeginTime + '~' + formData.periodEndTime,
|
||||
type: 'bar',
|
||||
barMaxWidth: 30,
|
||||
|
||||
// label: {
|
||||
// show: true,
|
||||
// position: 'top',
|
||||
@@ -234,10 +235,19 @@ const init = () => {
|
||||
let msg = ''
|
||||
msg += params[0].name
|
||||
for (let i in params) {
|
||||
|
||||
if (params[i].data == 3.14159) {
|
||||
msg += '(' + params[i].seriesName + ')' + '<br/>' + params[i].marker + ': 暂无数据<br/>'
|
||||
if (params[i].seriesName && params[i].seriesName.includes('~')) {
|
||||
msg += params[i].marker + ': 暂无数据<br/>'
|
||||
} else {
|
||||
msg += '(' + params[i].seriesName + ')' + '<br/>' + params[i].marker + ': 暂无数据<br/>'
|
||||
}
|
||||
} else {
|
||||
msg += '(' + params[i].seriesName + ')' + '<br/>' + params[i].marker + ': ' + params[i].data + '<br/>'
|
||||
if (params[i].seriesName && params[i].seriesName.includes('~')) {
|
||||
msg += params[i].marker + ': ' + params[i].data + '<br/>'
|
||||
} else {
|
||||
msg += '(' + params[i].seriesName + ')' + '<br/>' + params[i].marker + ': ' + params[i].data + '<br/>'
|
||||
}
|
||||
}
|
||||
}
|
||||
return msg
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="评价筛选">
|
||||
<el-input v-model="tableStore.table.params.evaluate" clearable placeholder="输入关键字筛选" />
|
||||
<el-input v-model="tableStore.table.params.evaluate" clearable placeholder="输入关键字筛选" maxlength="32" show-word-limit />
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user