|
|
@@ -84,6 +84,7 @@
|
|
|
:show-close="false"
|
|
|
:close-on-press-escape="false"
|
|
|
:wrapperClosable="false"
|
|
|
+ size="30%"
|
|
|
:before-close="dialogClose">
|
|
|
<el-form ref="barChartForm" :model="barChartForm" label-position="top" size="mini" style="margin: 0 20px 20px;">
|
|
|
<el-form-item label="图表标题：" prop="title" class="label-title1">
|
|
|
@@ -139,18 +140,23 @@
|
|
|
:label="item.value">{{ item.label }}
|
|
|
</el-radio>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="时间单位：" prop="bucketType" v-if="templateReportType == 1">
|
|
|
- <el-radio v-for="item in bucketTypeList"
|
|
|
- v-model="barChartForm.bucketType"
|
|
|
- :label="item.value">{{ item.label }}
|
|
|
- </el-radio>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="时段间隔：" prop="bucketValue" v-if="templateReportType == 1">
|
|
|
- <el-input-number label="请输入时段值"
|
|
|
- v-model="barChartForm.bucketValue"
|
|
|
- :min="1"
|
|
|
- :max="100"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
+ <el-divider content-position="left">取值周期设置</el-divider>
|
|
|
+ <div class="cy-line" style="margin-bottom: 20px;">
|
|
|
+ <el-form-item label="时间单位：" prop="bucketType" v-if="templateReportType == 1">
|
|
|
+ <el-radio v-for="item in bucketTypeList"
|
|
|
+ v-model="barChartForm.bucketType"
|
|
|
+ :label="item.value">{{ item.label }}
|
|
|
+ </el-radio>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="数据切换周期：" prop="bucketValue" v-if="templateReportType == 1">
|
|
|
+ <el-input-number label="请输入周期值"
|
|
|
+ v-model="barChartForm.bucketValue"
|
|
|
+ :precision="0"
|
|
|
+ :min="1"
|
|
|
+ :max="100"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
<!-- <el-button type="warning" size="mini" @click="insertBarChartForm(0)">应用</el-button>-->
|
|
|
<el-button type="primary" size="mini" @click="insertBarChartForm(1)">保存</el-button>
|
|
|
@@ -396,7 +402,7 @@
|
|
|
{{ getValByProp(bucketTypeList, scope.row.bucketType) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column v-if="templateReportType == 1" prop="bucketValue" label="取值时段间隔" align="center">
|
|
|
+ <el-table-column v-if="templateReportType == 1" prop="bucketValue" label="数据切换周期" align="center">
|
|
|
</el-table-column>
|
|
|
<template v-if="false">
|
|
|
<el-table-column prop="startTime" label="取值时段范围" align="center">
|
|
|
@@ -467,7 +473,7 @@
|
|
|
:visible.sync="dialogDataItemConfigVisible"
|
|
|
:close-on-click-modal="false"
|
|
|
:append-to-body="true">
|
|
|
- <el-form label-width="100px" ref="itemConditionForm" :model="itemConditionForm" :rules="itemConditionFormRules">
|
|
|
+ <el-form label-width="120px" ref="itemConditionForm" :model="itemConditionForm" :rules="itemConditionFormRules">
|
|
|
<el-form-item label="取值类型：" prop="valueType">
|
|
|
<el-radio v-for="item in valueTypeList"
|
|
|
v-model="itemConditionForm.valueType"
|
|
|
@@ -480,18 +486,6 @@
|
|
|
:label="item.value">{{ item.label }}
|
|
|
</el-radio>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="时间单位：" prop="bucketType" v-if="templateReportType == 1">
|
|
|
- <el-radio v-for="item in bucketTypeList"
|
|
|
- v-model="itemConditionForm.bucketType"
|
|
|
- :label="item.value">{{ item.label }}
|
|
|
- </el-radio>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="时段间隔：" prop="bucketValue" v-if="templateReportType == 1">
|
|
|
- <el-input-number label="请输入时段值"
|
|
|
- v-model="itemConditionForm.bucketValue"
|
|
|
- :min="1"
|
|
|
- :max="100"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
<template v-if="false">
|
|
|
<el-form-item label="取值时间：" prop="dateRange">
|
|
|
<el-date-picker
|
|
|
@@ -510,6 +504,22 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
+ <el-divider content-position="left">取值周期设置</el-divider>
|
|
|
+ <div class="cy-line">
|
|
|
+ <el-form-item label="时间单位：" prop="bucketType" v-if="templateReportType == 1">
|
|
|
+ <el-radio v-for="item in bucketTypeList"
|
|
|
+ v-model="itemConditionForm.bucketType"
|
|
|
+ :label="item.value">{{ item.label }}
|
|
|
+ </el-radio>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="数据切换周期：" prop="bucketValue" v-if="templateReportType == 1">
|
|
|
+ <el-input-number label="请输入周期值"
|
|
|
+ v-model="itemConditionForm.bucketValue"
|
|
|
+ :precision="0"
|
|
|
+ :min="1"
|
|
|
+ :max="100"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
</el-form>
|
|
|
<span slot='footer'>
|
|
|
<el-button type="primary" @click="chooseDataItemConfigEvent" style="margin-top: 20px;">确定</el-button>
|
|
|
@@ -691,7 +701,7 @@ export default {
|
|
|
{required: true, message: '请选择时间单位', trigger: 'change'}
|
|
|
],
|
|
|
bucketValue: [
|
|
|
- {required: true, message: '请输入时段间隔值', trigger: 'change'}
|
|
|
+ {required: true, message: '请输入周期值', trigger: 'change'}
|
|
|
]
|
|
|
},
|
|
|
itemShowParams: {
|
FinalYu