Compare commits
4 Commits
15e1be00af
...
2025-02
| Author | SHA1 | Date | |
|---|---|---|---|
| f4a22dbed1 | |||
| 566949569a | |||
| 52a0b67f96 | |||
| 50573bb748 |
@@ -47,3 +47,11 @@ export function queryByLineId(data) {
|
||||
params: data
|
||||
})
|
||||
}
|
||||
// 执行算法
|
||||
export function measurementPointExecutorByHour(data) {
|
||||
return request({
|
||||
url: '/prepare-boot/executor/measurementPointExecutorByHour',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
@@ -8,6 +8,16 @@ export function getAllMonitorPageList(data) {
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getAllMainUserPageList(data) {
|
||||
return request({
|
||||
url: '/device-boot/pms/monitor/getAllMainUserPageList',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 新增牵引站信息
|
||||
export function addMonitor(data) {
|
||||
return request({
|
||||
|
||||
@@ -51,3 +51,11 @@ export function objType(data) {
|
||||
params: data
|
||||
})
|
||||
}
|
||||
|
||||
export function objTypeStatis(data) {
|
||||
return request({
|
||||
url: '/device-boot/monitorStatistics/objTypeStatis',
|
||||
method: 'post',
|
||||
params: data
|
||||
})
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
v-show="!collapse"
|
||||
class="sidebar-title"
|
||||
:style="{ fontSize: settings.layout === 'layout1' && settings.title.length >= 8 ? '14px' : '24px'}"
|
||||
>{{ settings.title }} </h1>
|
||||
>{{ settings.title }} <span style="font-size: 14px">(v1.0.0)</span> </h1>
|
||||
</transition>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -22,35 +22,6 @@
|
||||
children: 'children'
|
||||
}"></el-cascader>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="监测点状态:">
|
||||
<el-select v-model="ruleForm.monitorState" placeholder="请选择" clearable class="select">
|
||||
<el-option clearable v-for="item in monitorStateList" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="上送网公司监测点:">
|
||||
<el-select v-model="ruleForm.isUpToGrid" placeholder="请选择" clearable class="select">
|
||||
<el-option label="是" value="1"></el-option>
|
||||
<el-option label="否" value="0"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="上送标识:" v-if="flag == 1">
|
||||
<el-select v-model="ruleForm.isUploadHead" placeholder="请选择" clearable style="width: 120px">
|
||||
<el-option label="未上送" value="0"></el-option>
|
||||
<el-option label="已上送" value="1"></el-option>
|
||||
<el-option label="取消上送" value="2"></el-option>
|
||||
<el-option label="待重新上送" value="3"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="上送标识:" v-if="flag == 0">
|
||||
<el-select v-model="ruleForm.monitorUploadStatus" placeholder="请选择" clearable style="width: 120px">
|
||||
<el-option label="未上送" value="0"></el-option>
|
||||
<el-option label="已上送" value="1"></el-option>
|
||||
<el-option label="取消上送" value="2"></el-option>
|
||||
<el-option label="待重新上送" value="3"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<!-- <el-button type="primary" icon="el-icon-download" class="pms">PMS获取数据</el-button>
|
||||
<el-button type="primary" icon="el-icon-upload2" class="ml10" @click="upload">PMS数据上传</el-button> -->
|
||||
@@ -59,26 +30,13 @@
|
||||
>重置</el-button
|
||||
> -->
|
||||
<el-button type="primary" icon="el-icon-download" @click="exportEvent">导出</el-button>
|
||||
<el-button v-if="flag == 1" type="primary" icon="el-icon-upload2" @click="Submission">
|
||||
网公司上送
|
||||
</el-button>
|
||||
<el-button v-if="flag == 0" type="primary" icon="el-icon-upload2" @click="LedgerSubmission">
|
||||
网公司上送
|
||||
</el-button>
|
||||
|
||||
</el-form-item>
|
||||
|
||||
</el-form>
|
||||
|
||||
<template>
|
||||
<span>
|
||||
<el-button type="primary" size="mini" class="ml10" icon="el-icon-plus" @click="addFn">新增</el-button>
|
||||
<el-button type="primary" size="mini" class="ml10" icon="el-icon-edit" @click="modifyFn">
|
||||
修改
|
||||
</el-button>
|
||||
<el-button type="primary" size="mini" class="ml10" icon="el-icon-delete" @click="deleteFn">
|
||||
删除
|
||||
</el-button>
|
||||
</span>
|
||||
|
||||
<vxe-table stripe :data="UserData" :height="height" border :row-config="{ isCurrent: true, isHover: true }"
|
||||
size="mini" ref="Monitoringpoint" style="width: 100%" v-loading="isLoading"
|
||||
header-cell-class-name="table_header" @checkbox-change="handleSelectionChange" class="mt10"
|
||||
@@ -88,48 +46,7 @@
|
||||
<vxe-table-column v-for="(item, index) in tableHeaderMonitoring" align="center" :field="item.prop"
|
||||
:title="item.label" :min-width="item.width" :key="index" :formatter="formFilter"
|
||||
:show-overflow="true"></vxe-table-column>
|
||||
<vxe-table-column v-if="flag == 1" align="center" field="isUploadHead" fixed="right" title="上送标识"
|
||||
min-width="150" :show-overflow="true">
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="primary" size="small" style="color: #409eff; background: #ecf5ff"
|
||||
v-if="scope.row.isUploadHead == 0">
|
||||
未上送
|
||||
</el-tag>
|
||||
<el-tag type="primary" size="small" style="color: #67c23a; background: #f0f9eb"
|
||||
v-if="scope.row.isUploadHead == 1">
|
||||
已上送
|
||||
</el-tag>
|
||||
<el-tag type="primary" size="small" style="color: #909399; background: #f4f4f5"
|
||||
v-if="scope.row.isUploadHead == 2">
|
||||
取消上送
|
||||
</el-tag>
|
||||
<el-tag type="primary" size="small" style="color: orange; background: #f4f4f5"
|
||||
v-if="scope.row.isUploadHead == 3">
|
||||
待重新上送
|
||||
</el-tag>
|
||||
</template>
|
||||
</vxe-table-column>
|
||||
<vxe-table-column v-else align="center" field="monitorUploadStatus" fixed="right" title="上送标识"
|
||||
min-width="150" :show-overflow="true">
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="primary" size="small" style="color: #409eff; background: #ecf5ff"
|
||||
v-if="scope.row.monitorUploadStatus == 0">
|
||||
未上送
|
||||
</el-tag>
|
||||
<el-tag type="primary" size="small" style="color: #67c23a; background: #f0f9eb"
|
||||
v-if="scope.row.monitorUploadStatus == 1">
|
||||
已上送
|
||||
</el-tag>
|
||||
<el-tag type="primary" size="small" style="color: #909399; background: #f4f4f5"
|
||||
v-if="scope.row.monitorUploadStatus == 2">
|
||||
取消上送
|
||||
</el-tag>
|
||||
<el-tag type="primary" size="small" style="color: orange; background: #f4f4f5"
|
||||
v-if="scope.row.monitorUploadStatus == 3">
|
||||
待重新上送
|
||||
</el-tag>
|
||||
</template>
|
||||
</vxe-table-column>
|
||||
|
||||
</vxe-table>
|
||||
<el-pagination background align="right" @size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange" :current-page="ruleForm.pageNum"
|
||||
@@ -137,23 +54,17 @@
|
||||
layout="total, sizes, prev, pager, next, jumper" :total="total" class="mt10"></el-pagination>
|
||||
</template>
|
||||
|
||||
<!-- <PMS_Data
|
||||
:PMSobtain="PMSobtain"
|
||||
:title="title"
|
||||
@Close="Close"
|
||||
:Data="UserData"
|
||||
:Name="tableHeaderMonitoring"
|
||||
></PMS_Data> -->
|
||||
|
||||
|
||||
<!-- 新增/修改 -->
|
||||
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="addinformation"
|
||||
:before-close="handleClose" width="50%" height="80%">
|
||||
<el-form :inline="true" :model="form" ref="rulesform" label-width="170px" :rules="rules" class="form">
|
||||
<el-form-item label="监测点编号:" class="mt10">
|
||||
<el-form-item label="用户编号:" class="mt10">
|
||||
<el-input v-model="form.id" placeholder="不填写默认生成自动编号" clearable :disabled="disabled"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="监测点名称:" prop="name" class="mt10">
|
||||
<el-input v-model="form.name" clearable placeholder="请输入监测点名称"></el-input>
|
||||
<el-form-item label="用户名称:" prop="name" class="mt10">
|
||||
<el-input v-model="form.name" clearable placeholder="请输入用户名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="orgName" class="mt10" label="组织机构名称:" :rules="{
|
||||
required: true,
|
||||
@@ -197,14 +108,14 @@
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="监测点状态:" prop="monitorState" class="mt10">
|
||||
<el-select v-model="form.monitorState" clearable placeholder="请选择监测点状态">
|
||||
<el-form-item label="用户状态:" prop="monitorState" class="mt10">
|
||||
<el-select v-model="form.monitorState" clearable placeholder="请选择用户状态">
|
||||
<el-option v-for="item in monitorStateList" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="监测点类型:" prop="monitorType" class="mt10">
|
||||
<el-select v-model="form.monitorType" clearable placeholder="请选择监测点类型">
|
||||
<el-form-item label="用户类型:" prop="monitorType" class="mt10">
|
||||
<el-select v-model="form.monitorType" clearable placeholder="请选择用户类型">
|
||||
<el-option v-for="item in monitorTypeList" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
@@ -345,8 +256,8 @@
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否是上送网公司监测点:" prop="isUpToGrid" class="mt10">
|
||||
<el-select v-model="form.isUpToGrid" clearable placeholder="请选择是否是上送网公司监测点">
|
||||
<el-form-item label="是否是上送网公司用户:" prop="isUpToGrid" class="mt10">
|
||||
<el-select v-model="form.isUpToGrid" clearable placeholder="请选择是否是上送网公司用户">
|
||||
<el-option v-for="item in whether" :key="item.id" :label="item.label"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
@@ -383,7 +294,7 @@ import {
|
||||
getTerminalSelectList,
|
||||
getPowerClientList,
|
||||
getPowerGenerationUserList,
|
||||
getAllMonitorPageList,
|
||||
getAllMainUserPageList,
|
||||
addMonitor,
|
||||
updateMonitor,
|
||||
delMonitor,
|
||||
@@ -491,7 +402,7 @@ export default {
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
name: [{ required: true, message: '请输入监测点名称', trigger: 'blur' }],
|
||||
name: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
|
||||
fieldStation: [{ required: true, message: '请输入新能源场', trigger: 'blur' }],
|
||||
// valueTitle: [
|
||||
// { required: true, message: "请输入组织机构名称", trigger:["blur",'change']},
|
||||
@@ -518,8 +429,8 @@ export default {
|
||||
}
|
||||
],
|
||||
voltageLevel: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
|
||||
monitorState: [{ required: true, message: '请选择监测点状态', trigger: 'change' }],
|
||||
monitorType: [{ required: true, message: '请选择监测点类型', trigger: 'change' }],
|
||||
monitorState: [{ required: true, message: '请选择用户状态', trigger: 'change' }],
|
||||
monitorType: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
|
||||
pt1: [
|
||||
{ required: true, message: '请输入pt1', trigger: 'blur' },
|
||||
{ pattern: /^[0-9]*$/, message: '只可以输入数字', trigger: 'blur' }
|
||||
@@ -599,7 +510,7 @@ export default {
|
||||
isUpToGrid: [
|
||||
{
|
||||
required: true,
|
||||
message: '请选择是否是上送网公司监测点',
|
||||
message: '请选择是否是上送网公司用户',
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
@@ -614,39 +525,18 @@ export default {
|
||||
monitorTagList: [],
|
||||
//台区台账表头
|
||||
tableHeaderMonitoring: [
|
||||
// { prop: 'id', label: '监测点编号', width: 120 },
|
||||
// { prop: 'id', label: '用户编号', width: 120 },
|
||||
{ prop: 'monitorObjectName', label: '监测对象名称', width: 250 },
|
||||
|
||||
{ prop: 'orgName', label: '组织机构名称', width: 170 },
|
||||
{ prop: 'operationName', label: '运维单位名称', width: 170 },
|
||||
{ prop: 'powerrName', label: '变电站名称', width: 120 },
|
||||
//{ prop: "generatrixName", label: "母线名称", width: 120 },
|
||||
{ prop: 'busId', label: '母线编号', width: 180 },
|
||||
|
||||
{ prop: 'lineName', label: '母线名称', width: 180 },
|
||||
// { prop: "lineId", label: "监测线路ID", width: 180 }
|
||||
{ prop: 'name', label: '测点名称', width: 220 },
|
||||
|
||||
{ prop: 'voltageLevel', label: '电压等级', width: 100 },
|
||||
{ prop: 'monitorState', label: '监测点状态', width: 120 },
|
||||
{ prop: 'monitorType', label: '监测点类型', width: 120 },
|
||||
{ prop: 'minShortCircuitCapacity', label: '最小短路容量', width: 120 },
|
||||
{ prop: 'powerSupplyEqCapacity', label: '供电设备容量', width: 120 },
|
||||
{ prop: 'userAgreementCapacity', label: '用户协议容量', width: 120 },
|
||||
{
|
||||
prop: 'voltageDeviationUpperLimit',
|
||||
label: '电压偏差限值（上）',
|
||||
width: 170
|
||||
},
|
||||
{
|
||||
prop: 'voltageDeviationLowerLimit',
|
||||
label: '电压偏差限值（下）',
|
||||
width: 170
|
||||
},
|
||||
{
|
||||
prop: 'potentialTransFormerType',
|
||||
label: '电压互感器类型',
|
||||
width: 170
|
||||
},
|
||||
{ prop: 'neutralGroundingMode', label: '中性点接地方式', width: 170 },
|
||||
|
||||
{
|
||||
prop: 'isSpecialSupplyElectricity',
|
||||
label: '是否用户专线',
|
||||
@@ -658,14 +548,9 @@ export default {
|
||||
// { prop: "monitorObjectId", label: "监测对象编号", width:170 },
|
||||
|
||||
{ prop: 'tradeCode', label: '行业分类', width: 170 },
|
||||
{ prop: 'statisticalInterval', label: '统计间隔(min)', width: 140 },
|
||||
{ prop: 'terminalCode', label: '关联的监测终端编号', width: 190 },
|
||||
{ prop: 'devIp', label: '监测终端IP', width: 150 },
|
||||
{ prop: 'terminalWiringMethod', label: '监测终端接线方式', width: 160 },
|
||||
|
||||
{ prop: 'fieldStation', label: '新能源场', width: 120 },
|
||||
{ prop: 'tractionId', label: '关联牵引站编号', width: 190 },
|
||||
{ prop: 'isUpToGrid', label: '是否是上送网公司', width: 160 }
|
||||
// { prop: "status", label: "数据状态", width:100 },
|
||||
|
||||
],
|
||||
whether: [
|
||||
{
|
||||
@@ -739,10 +624,10 @@ export default {
|
||||
TerminalNo: [], //关联的监测终端编号
|
||||
voltageLevelList: [], //电压等级
|
||||
industryType: [], //行业分类
|
||||
monitorStateList: [], //监测点状态
|
||||
monitorTypeList: [], //监测点标签
|
||||
MonitoringPointType: [], //监测点类型
|
||||
MonitoringPointTypes: [], //监测点类型
|
||||
monitorStateList: [], //用户状态
|
||||
monitorTypeList: [], //用户标签
|
||||
MonitoringPointType: [], //用户类型
|
||||
MonitoringPointTypes: [], //用户类型
|
||||
potentialTransFormerTypeList: [], //电压互感器类型
|
||||
neutralGroundingModeList: [], //中性点接地方式
|
||||
|
||||
@@ -849,23 +734,23 @@ export default {
|
||||
getclassificationData() {
|
||||
//电压等级
|
||||
this.voltageLevelList = dicData('Dev_Voltage', [])
|
||||
//监测点状态
|
||||
//用户状态
|
||||
this.monitorStateList = dicData('Line_State', [])
|
||||
|
||||
//监测点标签
|
||||
//用户标签
|
||||
this.monitorTypeList = dicData('Line_Type', [])
|
||||
//电压互感器类型
|
||||
this.potentialTransFormerTypeList = dicData('Voltage_Transformer', [])
|
||||
//中性点接地方式
|
||||
this.neutralGroundingModeList = dicData('Neutral_Point', [])
|
||||
//监测点标签
|
||||
//用户标签
|
||||
this.monitorTagList = dicData('Monitoring_Labels', [])
|
||||
//监测终端接线方式
|
||||
this.terminalWiringMethodList = dicData('Dev_Connect', [])
|
||||
//行业分类
|
||||
this.industryType = dicData('industry_type', [])
|
||||
|
||||
// 监测点类型
|
||||
// 用户类型
|
||||
queryTree({}).then(res => {
|
||||
if (res && res.code == `A0000`) {
|
||||
this.MonitoringPointType = this.getTreeData(res.data)
|
||||
@@ -926,7 +811,7 @@ export default {
|
||||
} else {
|
||||
this.ruleForm.objType = ''
|
||||
}
|
||||
getAllMonitorPageList(this.ruleForm).then(res => {
|
||||
getAllMainUserPageList(this.ruleForm).then(res => {
|
||||
this.isLoading = false
|
||||
this.UserData = res.data.records
|
||||
this.total = res.data.total
|
||||
@@ -1160,7 +1045,7 @@ export default {
|
||||
this.disabled = false
|
||||
this.modify = false
|
||||
this.add = true
|
||||
this.title = '新增主网监测点台帐'
|
||||
this.title = '新增主网用户台帐'
|
||||
this.addinformation = true
|
||||
// this.getData();
|
||||
},
|
||||
@@ -1212,7 +1097,7 @@ export default {
|
||||
},
|
||||
handleClose() {
|
||||
this.addinformation = false
|
||||
if (this.title == '新增主网监测点台帐') {
|
||||
if (this.title == '新增主网用户台帐') {
|
||||
this.$refs.Operation.form.valueTitle = ''
|
||||
this.$refs.Organization.form.valueTitle = ''
|
||||
}
|
||||
@@ -1224,7 +1109,7 @@ export default {
|
||||
this.modify = true
|
||||
this.add = false
|
||||
|
||||
this.title = '修改主网监测点台帐'
|
||||
this.title = '修改主网用户台帐'
|
||||
if (this.$refs.Monitoringpoint.getCheckboxRecords().length != 1) {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
@@ -1383,9 +1268,9 @@ export default {
|
||||
let form = JSON.parse(JSON.stringify(this.ruleForm))
|
||||
form.pageNum = 1
|
||||
form.pageSize = this.total
|
||||
getAllMonitorPageList(form).then(res => {
|
||||
getAllMainUserPageList(form).then(res => {
|
||||
this.$refs.Monitoringpoint.exportData({
|
||||
filename: '监测点台账', // 文件名字
|
||||
filename: '用户台账', // 文件名字
|
||||
sheetName: 'Sheet1',
|
||||
type: 'xlsx', //导出文件类型 xlsx 和 csv
|
||||
useStyle: true,
|
||||
@@ -1416,7 +1301,7 @@ export default {
|
||||
let flagState = true
|
||||
if (this.$refs.Monitoringpoint.getCheckboxRecords().length == 0) {
|
||||
return this.$message({
|
||||
message: '请选择监测点!',
|
||||
message: '请选择用户!',
|
||||
type: 'warning'
|
||||
})
|
||||
}
|
||||
@@ -1474,18 +1359,18 @@ export default {
|
||||
})
|
||||
} else if (flag == false) {
|
||||
return this.$message({
|
||||
message: '所选监测点与监测对象不符合,请重新选择!',
|
||||
message: '所选用户与监测对象不符合,请重新选择!',
|
||||
type: 'warning'
|
||||
})
|
||||
} else if (isUpToGrid == false) {
|
||||
return this.$message({
|
||||
message: '所选监测点存在非上送网公司监测点!',
|
||||
message: '所选用户存在非上送网公司用户!',
|
||||
type: 'warning'
|
||||
})
|
||||
} else if (flagState == false) {
|
||||
return this.$message({
|
||||
type: 'warning',
|
||||
message: '请选择运行状态的监测点进行上送!'
|
||||
message: '请选择运行状态的用户进行上送!'
|
||||
})
|
||||
}
|
||||
// this.objTypeVisible = true
|
||||
@@ -1511,7 +1396,7 @@ export default {
|
||||
|
||||
if (isUpToGrid && flagState) {
|
||||
if (this.$refs.Monitoringpoint.getCheckboxRecords().length == 0) {
|
||||
this.$confirm('是否上送全部监测点?', '提示', {
|
||||
this.$confirm('是否上送全部用户?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
@@ -1553,13 +1438,13 @@ export default {
|
||||
}
|
||||
} else if (isUpToGrid == false) {
|
||||
return this.$message({
|
||||
message: '所选监测点存在非上送网公司监测点!',
|
||||
message: '所选用户存在非上送网公司用户!',
|
||||
type: 'warning'
|
||||
})
|
||||
} else if (flagState == false) {
|
||||
return this.$message({
|
||||
type: 'warning',
|
||||
message: '请选择运行状态的监测点进行上送!'
|
||||
message: '请选择运行状态的用户进行上送!'
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
@@ -23,24 +23,18 @@
|
||||
v-loading="isLoading"
|
||||
header-cell-class-name="table_header"
|
||||
>
|
||||
<vxe-table-column
|
||||
field="prop0"
|
||||
title=""
|
||||
align="center"
|
||||
min-width="250"
|
||||
show-overflow="true"
|
||||
></vxe-table-column>
|
||||
|
||||
<vxe-table-colgroup align="center" v-for="(item, index) in tableHeaderPower" :title="item.label">
|
||||
|
||||
|
||||
<vxe-table-column
|
||||
v-for="(val, index) in item.children"
|
||||
v-for="(val, index) in tableHeaderPower"
|
||||
align="center"
|
||||
:field="val.prop"
|
||||
:title="val.label"
|
||||
:min-width="val.width"
|
||||
:show-overflow="true"
|
||||
></vxe-table-column>
|
||||
</vxe-table-colgroup>
|
||||
|
||||
</vxe-table>
|
||||
</template>
|
||||
</div>
|
||||
@@ -48,7 +42,7 @@
|
||||
|
||||
<script>
|
||||
// import bus from "@/assets/js/eventBus";
|
||||
import { objType } from '@/api/hbaccountoperation/setInformation'
|
||||
import { objType, objTypeStatis } from '@/api/hbaccountoperation/setInformation'
|
||||
import Area from '@/views/components/Area/Area.vue'
|
||||
import { dicData } from '@/assets/commjs/dictypeData'
|
||||
|
||||
@@ -95,20 +89,9 @@ export default {
|
||||
//查询母线信息
|
||||
Power() {
|
||||
this.isLoading = true
|
||||
|
||||
this.tableHeaderPower = []
|
||||
this.busData = []
|
||||
objType(this.ruleForm).then(res => {
|
||||
this.tableHeaderPower = [
|
||||
{
|
||||
label: '用户分类',
|
||||
children: []
|
||||
},
|
||||
{
|
||||
label: '典型用户分类',
|
||||
children: []
|
||||
}
|
||||
]
|
||||
|
||||
objTypeStatis(this.ruleForm).then(res => {
|
||||
let data = res.data
|
||||
let result = data[0].reduce(
|
||||
(acc, item) => {
|
||||
@@ -121,23 +104,17 @@ export default {
|
||||
},
|
||||
[[]]
|
||||
)
|
||||
result[0].shift()
|
||||
result[0].push('合计')
|
||||
|
||||
|
||||
Array.from(result[0]).forEach((char, i) => {
|
||||
this.tableHeaderPower[0].children.push({
|
||||
prop: `prop${i + 1}`,
|
||||
label: char,
|
||||
width: char.length > 9 ? 250 : 130
|
||||
})
|
||||
})
|
||||
result[1].push('合计')
|
||||
Array.from(result[1]).forEach((char, i) => {
|
||||
this.tableHeaderPower[1].children.push({
|
||||
prop: `prop${result[0].length + i + 1}`,
|
||||
this.tableHeaderPower.push({
|
||||
prop: `prop${i}`,
|
||||
label: char,
|
||||
width: char.length > 9 ? 250 : 130
|
||||
})
|
||||
})
|
||||
this.tableHeaderPower[0].width = 350
|
||||
console.log(this.tableHeaderPower)
|
||||
|
||||
data.shift()
|
||||
data.forEach((item, ind) => {
|
||||
@@ -147,6 +124,9 @@ export default {
|
||||
this.busData[ind][`prop${i}`] = char
|
||||
})
|
||||
})
|
||||
console.log(this.busData)
|
||||
|
||||
|
||||
this.isLoading = false
|
||||
})
|
||||
},
|
||||
|
||||
@@ -43,14 +43,8 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="CVT型号:" v-show="condition.includes('40')">
|
||||
<!-- <el-cascader
|
||||
v-model="cvt"
|
||||
:options="cvtList"
|
||||
:props="{ expandTrigger: 'hover' }"
|
||||
clearable
|
||||
filterable
|
||||
></el-cascader> -->
|
||||
<!-- <el-form-item label="CVT型号:" v-show="condition.includes('40')">
|
||||
|
||||
<el-select v-model="cvt" value-key="value" clearable filterable placeholder="请选择CVT型号">
|
||||
<el-option
|
||||
v-for="item in cvtList"
|
||||
@@ -59,7 +53,7 @@
|
||||
:value="item"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item v-show="jxb" label="间谐波次数:">
|
||||
<el-select v-model="formData.inHarmonic" placeholder="请选择间谐波">
|
||||
<el-option
|
||||
|
||||
@@ -12,15 +12,17 @@
|
||||
执行日期:
|
||||
<el-date-picker
|
||||
v-model="time"
|
||||
type="daterange"
|
||||
type="datetimerange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
:picker-options="pickerOptions"
|
||||
:clearable="false"
|
||||
></el-date-picker>
|
||||
</div>
|
||||
<el-button type="primary" @click="handleClose">执 行</el-button>
|
||||
<el-button type="primary" @click="execute">执 行</el-button>
|
||||
</div>
|
||||
<el-input placeholder="输入关键字检索" v-model="filterText" style="margin-bottom: 10px" clearable>
|
||||
<i slot="prefix" class="el-input__icon el-icon-search"></i>
|
||||
@@ -56,12 +58,14 @@
|
||||
<script>
|
||||
import api from '@/api/harmonic/onlineData'
|
||||
import { dicData } from '@/assets/commjs/dictypeData'
|
||||
import { measurementPointExecutorByHour } from '@/api/CVT/index.js'
|
||||
export default {
|
||||
components: {},
|
||||
props: {},
|
||||
data() {
|
||||
return {
|
||||
time: [new Date(), new Date()],
|
||||
time: [],
|
||||
// value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
|
||||
dialogVisible: false,
|
||||
checkedarr: [],
|
||||
fiveData: [],
|
||||
@@ -79,7 +83,14 @@ export default {
|
||||
scale: null
|
||||
},
|
||||
filterText: '',
|
||||
fiveData: []
|
||||
fiveData: [],
|
||||
fatherID: [],
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() > Date.now() - 8.64e6
|
||||
// 或者return time.getTime() > Date.now();
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -100,8 +111,23 @@ export default {
|
||||
this.chuli()
|
||||
}
|
||||
})
|
||||
// 获取年份
|
||||
const year = new Date().getFullYear()
|
||||
// 获取月份（注意：getMonth 返回值是 0 - 11，所以要加 1），并确保是两位数
|
||||
const month = String(new Date().getMonth() + 1).padStart(2, '0')
|
||||
// 获取日期，并确保是两位数
|
||||
const day = String(new Date().getDate()).padStart(2, '0')
|
||||
// 获取小时，并确保是两位数
|
||||
const hours = String(new Date().getHours()).padStart(2, '0')
|
||||
// 获取分钟，并确保是两位数
|
||||
const minutes = String(new Date().getMinutes()).padStart(2, '0')
|
||||
// 获取秒数，并确保是两位数
|
||||
const seconds = String(new Date().getSeconds()).padStart(2, '0')
|
||||
|
||||
this.time = [`${year}-${month}-${day} 00:00:00`, `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`]
|
||||
},
|
||||
chuli() {
|
||||
this.fatherID = []
|
||||
var data = this.fiveData
|
||||
var arr = []
|
||||
data.forEach(item => {
|
||||
@@ -128,8 +154,10 @@ export default {
|
||||
if (arr[0].children[0].children[0].children.length > 0) {
|
||||
arr.forEach(m => {
|
||||
m.icon = 'el-icon-menu'
|
||||
this.fatherID.push(m.id)
|
||||
m.children.forEach(n => {
|
||||
n.icon = 'el-icon-share'
|
||||
this.fatherID.push(n.id)
|
||||
n.children.forEach(d => {
|
||||
d.icon = 'el-icon-s-flag'
|
||||
d.children.forEach((f, i) => {
|
||||
@@ -148,8 +176,10 @@ export default {
|
||||
} else if (arr[0].children[0].children[0].children.length == 0) {
|
||||
arr.forEach(m => {
|
||||
m.icon = 'el-icon-menu'
|
||||
this.fatherID.push(m.id)
|
||||
m.children.forEach(n => {
|
||||
n.icon = 'el-icon-share'
|
||||
this.fatherID.push(n.id)
|
||||
n.children.forEach((d, i) => {
|
||||
d.icon = 'el-icon-warning'
|
||||
d.name = i + 1 + '_' + d.name
|
||||
@@ -169,9 +199,7 @@ export default {
|
||||
|
||||
window.sessionStorage.setItem('tree', this.tree)
|
||||
this.expandID.push(this.currentNode)
|
||||
this.$nextTick(() => {
|
||||
this.$refs.menuTree.setCurrentKey(this.currentNode)
|
||||
})
|
||||
|
||||
//初始化触发默认点击方法
|
||||
//alert('初始1')
|
||||
this.$emit('chushiData', this.currentNode, this.treeMenuData)
|
||||
@@ -179,6 +207,7 @@ export default {
|
||||
|
||||
renderContent(h, { node, data, store }) {
|
||||
this.onlinename = node.label
|
||||
|
||||
return (
|
||||
<span style="flex: 1; display: flex; align-items: center; justify-content: space-between; padding-right: 8px;">
|
||||
<span class="span-ellipsis">
|
||||
@@ -191,11 +220,28 @@ export default {
|
||||
</span>
|
||||
)
|
||||
},
|
||||
// 执行算法
|
||||
async execute() {
|
||||
if (this.$refs.menuTree.getCheckedKeys().length == 0) return this.$message.error('请选择监测点!')
|
||||
|
||||
let data = {
|
||||
beginTime: this.time[0],
|
||||
dataDate: '',
|
||||
endTime: this.time[1],
|
||||
fullChain: false,
|
||||
idList: this.$refs.menuTree.getCheckedKeys().filter(item => !this.fatherID.includes(item)),
|
||||
repair: true,
|
||||
tagNames: ['dataHarmRateVCvt']
|
||||
}
|
||||
await measurementPointExecutorByHour(data)
|
||||
this.$message.success('算法执行成功!')
|
||||
this.handleClose()
|
||||
},
|
||||
|
||||
// 关闭弹窗
|
||||
handleClose() {
|
||||
console.log(this.time)
|
||||
|
||||
this.dialogVisible = false
|
||||
this.$emit('close')
|
||||
},
|
||||
// 过滤树节点
|
||||
filterNode(value, data, node) {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<timeindex :id="1" ref="fff" :interval="3"></timeindex>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="筛选:" class="ml10">
|
||||
<el-input v-model="form.searchValue" placeholder="输入关键字搜索" style="width: 100%" clearable />
|
||||
<el-input v-model.trim="form.searchValue" placeholder="输入关键字搜索" style="width: 100%" clearable />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item class="ml10">
|
||||
@@ -218,10 +218,19 @@ export default {
|
||||
id: ''
|
||||
})
|
||||
let data = this.tables.filter(item => item.id == this.radioId)
|
||||
this.tables = this.tables.filter(item => {
|
||||
// 将 a 和 b 属性的值转换为字符串，然后检查是否包含目标值转换后的字符串
|
||||
return (
|
||||
String(item.cvtName).includes(String(this.form.searchValue)) ||
|
||||
String(item.cvtModel).includes(String(this.form.searchValue))
|
||||
)
|
||||
})
|
||||
data.length > 0
|
||||
? this.$refs.tableRef.setRadioRow(data[0])
|
||||
: this.$refs.tableRef.setRadioRow(this.tables[0])
|
||||
this.isLoading = false
|
||||
}).catch(() => {
|
||||
this.isLoading = false
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<timeindex :id="1" ref="fff" :interval="3"></timeindex>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="筛选:" class="ml10">
|
||||
<el-input v-model="form.searchValue" clearable placeholder="输入关键字搜索" style="width: 100%" />
|
||||
<el-input v-model.trim="form.searchValue" clearable placeholder="输入关键字搜索" style="width: 100%" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item class="ml10">
|
||||
@@ -23,7 +23,6 @@
|
||||
:row-config="{ isCurrent: true, isHover: true }"
|
||||
size="mini"
|
||||
ref="classification"
|
||||
|
||||
style="width: 100%"
|
||||
header-cell-class-name="table_header"
|
||||
>
|
||||
@@ -63,7 +62,7 @@
|
||||
<forms ref="formRef" @querfromdata="querfromdata" @showForm="showForm = false" v-if="showForm" />
|
||||
|
||||
<!-- 执行算法 -->
|
||||
<algorithm ref="algorithmRef" />
|
||||
<algorithm ref="algorithmRef" v-if="showAlgorithm" @close="showAlgorithm = false" />
|
||||
<!-- <el-pagination
|
||||
background
|
||||
align="right"
|
||||
@@ -89,6 +88,7 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
showAlgorithm: false,
|
||||
form: {
|
||||
pageNum: 1,
|
||||
pageSize: 10000,
|
||||
@@ -183,7 +183,10 @@ export default {
|
||||
},
|
||||
// 执行算法
|
||||
handleAlgorithm() {
|
||||
this.showAlgorithm = true
|
||||
setTimeout(() => {
|
||||
this.$refs.algorithmRef.open()
|
||||
}, 100)
|
||||
},
|
||||
// 绑定监测点
|
||||
handleBind(index, row) {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
>
|
||||
<el-form ref="form" :inline="true" :model="form" label-width="auto" :rules="rules" class="form">
|
||||
<el-form-item label="CVT名称:" prop="cvtName" style="width: 49%">
|
||||
<el-input v-model="form.cvtName" placeholder="请输入CVT名称" />
|
||||
<el-input v-model.trim="form.cvtName" placeholder="请输入CVT名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="CVT型号:" prop="cvtModel" style="width: 49%">
|
||||
<el-input v-model="form.cvtModel" placeholder="请输入CVT型号" />
|
||||
<el-input v-model.trim="form.cvtModel" placeholder="请输入CVT型号" />
|
||||
</el-form-item>
|
||||
<el-form-item v-for="item in frequency" :label="`${item}次:`" :prop="`h${item}`">
|
||||
<el-input type="number" v-model="form[`h${item}`]" @input="handleInput($event, `h${item}`)" />
|
||||
<el-input type="number" v-model.trim="form[`h${item}`]" @input="handleInput($event, `h${item}`)" />
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="2次:" prop="h2">
|
||||
|
||||
@@ -542,19 +542,8 @@ export default {
|
||||
month = '0' + month
|
||||
}
|
||||
this.form.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
} else {
|
||||
this.form.searchBeginTime = this.$refs.fff.timeValue[0]
|
||||
this.form.searchEndTime = this.$refs.fff.timeValue[1]
|
||||
@@ -938,7 +927,7 @@ export default {
|
||||
|
||||
myChart2.clear(option)
|
||||
myChart2.setOption(option)
|
||||
window.echartsArr.push(myChart2)
|
||||
window.echartsArr.push(myChart2)
|
||||
setTimeout(function () {
|
||||
myChart2.resize()
|
||||
}, 0)
|
||||
@@ -976,19 +965,8 @@ window.echartsArr.push(myChart2)
|
||||
month = '0' + month
|
||||
}
|
||||
this.form.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
} else {
|
||||
this.form.searchBeginTime = this.$refs.fff.timeValue[0]
|
||||
this.form.searchEndTime = this.$refs.fff.timeValue[1]
|
||||
@@ -1320,7 +1298,7 @@ window.echartsArr.push(myChart2)
|
||||
]
|
||||
}
|
||||
option && myChart2.setOption(option, true)
|
||||
window.echartsArr.push(myChart2)
|
||||
window.echartsArr.push(myChart2)
|
||||
setTimeout(function () {
|
||||
myChart2.resize()
|
||||
}, 0)
|
||||
@@ -1349,19 +1327,8 @@ window.echartsArr.push(myChart2)
|
||||
month = '0' + month
|
||||
}
|
||||
this.form.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
} else {
|
||||
this.form.searchBeginTime = this.$refs.fff.timeValue[0]
|
||||
this.form.searchEndTime = this.$refs.fff.timeValue[1]
|
||||
@@ -1545,7 +1512,7 @@ window.echartsArr.push(myChart2)
|
||||
}
|
||||
|
||||
option && myChart2.setOption(option, true)
|
||||
window.echartsArr.push(myChart2)
|
||||
window.echartsArr.push(myChart2)
|
||||
setTimeout(function () {
|
||||
myChart2.resize()
|
||||
}, 0)
|
||||
@@ -1571,19 +1538,8 @@ window.echartsArr.push(myChart2)
|
||||
month = '0' + month
|
||||
}
|
||||
this.form.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
} else {
|
||||
this.form.searchBeginTime = this.$refs.fff.timeValue[0]
|
||||
this.form.searchEndTime = this.$refs.fff.timeValue[1]
|
||||
@@ -1768,7 +1724,7 @@ window.echartsArr.push(myChart2)
|
||||
}
|
||||
|
||||
option && myChart2.setOption(option, true)
|
||||
window.echartsArr.push(myChart2)
|
||||
window.echartsArr.push(myChart2)
|
||||
setTimeout(function () {
|
||||
myChart2.resize()
|
||||
}, 0)
|
||||
@@ -1796,19 +1752,8 @@ window.echartsArr.push(myChart2)
|
||||
month = '0' + month
|
||||
}
|
||||
this.form.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.form.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
} else {
|
||||
this.form.searchBeginTime = this.$refs.fff.timeValue[0]
|
||||
this.form.searchEndTime = this.$refs.fff.timeValue[1]
|
||||
@@ -2030,7 +1975,7 @@ window.echartsArr.push(myChart2)
|
||||
]
|
||||
}
|
||||
option && myChart2.setOption(option, true)
|
||||
window.echartsArr.push(myChart2)
|
||||
window.echartsArr.push(myChart2)
|
||||
setTimeout(function () {
|
||||
myChart2.resize()
|
||||
}, 0)
|
||||
|
||||
@@ -805,19 +805,9 @@ export default {
|
||||
month = '0' + month
|
||||
}
|
||||
this.formData.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
|
||||
} else {
|
||||
this.formData.searchBeginTime = this.$refs.timelist.timeValue[0]
|
||||
this.formData.searchEndTime = this.$refs.timelist.timeValue[1]
|
||||
|
||||
@@ -676,19 +676,9 @@ export default {
|
||||
month = '0' + month
|
||||
}
|
||||
this.formData.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
|
||||
} else {
|
||||
this.formData.searchBeginTime = this.$refs.fkf.timeValue[0]
|
||||
this.formData.searchEndTime = this.$refs.fkf.timeValue[1]
|
||||
|
||||
@@ -910,19 +910,9 @@ export default {
|
||||
month = '0' + month
|
||||
}
|
||||
this.formData.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
|
||||
} else {
|
||||
this.formData.searchBeginTime = this.$refs.fyf.timeValue[0]
|
||||
this.formData.searchEndTime = this.$refs.fyf.timeValue[1]
|
||||
|
||||
@@ -657,19 +657,9 @@ export default {
|
||||
month = '0' + month
|
||||
}
|
||||
this.formData.searchBeginTime = str1[0] + '-' + month + '-' + str1[2]
|
||||
if (
|
||||
month == 1 ||
|
||||
month == 3 ||
|
||||
month == 5 ||
|
||||
month == 7 ||
|
||||
month == 8 ||
|
||||
month == 10 ||
|
||||
month == 12
|
||||
) {
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-31'
|
||||
} else {
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-30'
|
||||
}
|
||||
|
||||
this.formData.searchEndTime = str2[0] + '-' + month + '-' + new Date(str2[0], month, 0).getDate()
|
||||
|
||||
} else {
|
||||
this.formData.searchBeginTime = this.$refs.timepg.timeValue[0]
|
||||
this.formData.searchEndTime = this.$refs.timepg.timeValue[1]
|
||||
|
||||
Reference in New Issue
Block a user