lianmei
/
dc-ui
mirror of https://gitee.com/lmlz_0/dc-ui.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' of https://gitee.com/lmlz_0/dc-ui into develop

develop^2
fuguobin 8 months ago
parent
614f70d596 de5b3e2a5f
commit
f1b2c885a3
3 changed files with 523 additions and 151 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      src/api/model/dcHeatStandardDeviceStrategyConf.js
  2. 517
      src/views/model/heatapiconf/index.vue
  3. 82
      src/views/model/heatapiconf/paramModel.vue

67
src/api/model/dcHeatStandardDeviceStrategyConf.js
View File

@ -0,0 +1,67 @@
import request from '@/utils/request'
// 查询设备策略配置列表
export function listDcHeatStandardDeviceStrategyConf(query) {
return request({
url: '/model/dcHeatStandardDeviceStrategyConf/list',
method: 'get',
params: query
})
}
// 查询设备策略配置详细
export function getDcHeatStandardDeviceStrategyConf(id) {
return request({
url: '/model/dcHeatStandardDeviceStrategyConf/' + id,
method: 'get'
})
}
// 新增设备策略配置
export function addDcHeatStandardDeviceStrategyConf(data) {
return request({
url: '/model/dcHeatStandardDeviceStrategyConf',
method: 'post',
data: data
})
}
// 批量新增设备策略配置
export function addBatchDcHeatStandardDeviceStrategyConf(confId, list) {
return request({
url: '/model/dcHeatStandardDeviceStrategyConf',
method: 'post',
params: {
confId: confId
},
data: {
list: list
}
})
}
// 修改设备策略配置
export function updateDcHeatStandardDeviceStrategyConf(data) {
return request({
url: '/model/dcHeatStandardDeviceStrategyConf',
method: 'put',
data: data
})
}
// 删除设备策略配置
export function delDcHeatStandardDeviceStrategyConf(id) {
return request({
url: '/model/dcHeatStandardDeviceStrategyConf/' + id,
method: 'delete'
})
}
// 导出设备策略配置
export function exportDcHeatStandardDeviceStrategyConf(query) {
return request({
url: '/${baseUrl}/export',
method: 'get',
params: query
})
}

517
src/views/model/heatapiconf/index.vue
View File

@ -3,38 +3,41 @@
<el-row> <el-row>
<el-col :span="4" class="card-box"> <el-col :span="4" class="card-box">
<div class="head-container"> <div class="head-container">
<el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search" style="margin-bottom: 20px" /> <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
style="margin-bottom: 20px"/>
</div> </div>
<div class="head-container"> <div class="head-container">
<el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
:filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all
@node-click="handleNodeClick" /> @node-click="handleNodeClick"/>
</div> </div>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
class="my-custom-form"> class="my-custom-form">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="排除设备" prop="excludeDevices" label-width="auto"> <el-form-item label="排除设备" prop="excludeDevices" label-width="auto">
<el-select v-model="queryParams.excludeDevices" placeholder="请选择排除设备" clearable multiple> <el-select v-model="queryParams.excludeDevices" placeholder="请选择排除设备" clearable multiple>
<el-option <el-option
v-for="dict in listDeviceAll" v-for="dict in listDeviceAll"
:key="dict.uuid" :key="dict.uuid"
:label="dict.deviceName" :label="dict.deviceName"
:value="dict.uuid" :value="dict.uuid"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="标准值" prop="standard" label-width="auto"> <el-form-item label="标准值" prop="standard" label-width="auto">
<el-input v-model="queryParams.standard" placeholder="请输入标准值" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.standard" placeholder="请输入标准值" clearable
@keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="发送地址" prop="sendIp" label-width="auto"> <el-form-item label="发送地址" prop="sendIp" label-width="auto">
<el-input v-model="queryParams.sendIp" placeholder="请输入发送地址" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.sendIp" placeholder="请输入发送地址" clearable
@keyup.enter="handleQuery"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -62,18 +65,21 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="heatapiconfList" @selection-change="handleSelectionChange" <el-table v-loading="loading" :data="heatapiconfList" @selection-change="handleSelectionChange"
:max-height="tableHeight" :border="true" :column-width-draggable="true"> :max-height="tableHeight" :border="true" :column-width-draggable="true">
<el-table-column type="selection" width="55" align="center" fixed="left" /> <el-table-column type="selection" width="55" align="center" fixed="left"/>
<!-- <el-table-column label="主键" align="center" prop="id" /> --> <!-- <el-table-column label="主键" align="center" prop="id" /> -->
<el-table-column label="机构编号" align="center" prop="orgCode" /> <el-table-column label="机构编号" align="center" prop="orgCode"/>
<el-table-column label="机构名称" align="center" prop="orgName" /> <el-table-column label="机构名称" align="center" prop="orgName"/>
<el-table-column label="排除设备" align="center" prop="excludeDevices" show-overflow-tooltip="true" > <!-- <el-table-column label="排除设备" align="center" prop="excludeDevices" show-overflow-tooltip="true" >-->
<template #default="scope"> <!-- <template #default="scope">-->
{{getDevicesNames(scope.row.excludeDevices)}} <!-- {{getDevicesNames(scope.row.excludeDevices)}}-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="标准值" align="center" prop="standard" /> <el-table-column label="推送方" align="center" prop="pushingCounterpart"
<el-table-column label="发送地址" align="center" prop="sendIp" /> :formatter="formatterPushingCounterpart"/>
<!-- <el-table-column label="策略" align="center" prop="strategy" :formatter="formatterStrategy"/>-->
<el-table-column label="标准值" align="center" prop="standard"/>
<!-- <el-table-column label="发送地址" align="center" prop="sendIp"/>-->
<el-table-column label="是否发送" align="center" prop="available"> <el-table-column label="是否发送" align="center" prop="available">
<template #default="scope"> <template #default="scope">
<el-switch v-model="scope.row.available" @change="changeEnabled(scope.row)"/> <el-switch v-model="scope.row.available" @change="changeEnabled(scope.row)"/>
@ -85,11 +91,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300" <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300"
:fixed="fixedColumns ? 'right' : false"> :fixed="fixedColumns ? 'right' : false">
<template #header> <template #header>
<div class="fixed-column-header" style="text-align: center;display: block;" @dblclick="toggleFixedColumns"> <div class="fixed-column-header" style="text-align: center;display: block;"
<span style="text-align: center;display: block;">操作<img style="width:10px;margin-left:5px" @dblclick="toggleFixedColumns">
v-show="fixedColumns" :src="lock" alt="Image" /></span> <span style="text-align: center;display: block;">操作<img style="width:10px;margin-left:5px" v-show="fixedColumns" :src="lock" alt="Image"/></span>
</div> </div>
</template> </template>
<template #default="scope"> <template #default="scope">
@ -101,57 +107,81 @@
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" /> v-model:limit="queryParams.pageSize" @pagination="getList"/>
</el-col> </el-col>
</el-row> </el-row>
<!-- 添加或修改供热办推送接口配置对话框 --> <!-- 添加或修改供热办推送接口配置对话框 -->
<el-dialog :title="title" v-model="open" width="700px" append-to-body draggable> <el-dialog :title="title" v-model="open" width="1000px" append-to-body draggable :close-on-click-modal="false">
<el-form ref="heatapiconfRef" :model="form" :rules="rules" label-width="80px"> <el-form ref="heatapiconfRef" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属公司" prop="orgCode"> <el-form-item label="热源" prop="orgCode">
<el-tree-select <el-tree-select
:disabled = "editable" v-model="form.orgCode"
v-model="form.orgCode" :data="deptOptions"
:data="deptOptions" :props="{ value: 'id', label: 'label', children: 'children' }"
:props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
value-key="id" placeholder="请选择"
placeholder="请选择" check-strictly
check-strictly :default-expand-all="true"
:default-expand-all="true" @node-click="selectDept"
@node-click="selectDept" filterable
filterable style="width:100%"
style="width:100%" :disabled="editable"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="推送方" prop="pushingCounterpart">
<el-select v-model="form.pushingCounterpart" placeholder="请选择推送方" style="width: 100%;">
<el-option v-for="dict in pushing_counterpart" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="标准值" prop="standard"> <el-form-item label="标准值" prop="standard">
<el-input v-model="form.standard" placeholder="请输入标准值" /> <el-input type="number" v-model="form.standard" placeholder="请输入标准值"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="发送地址" prop="sendIp" v-hasPermi="['model:heatapiconf:edit']"> <el-form-item label="日期范围" prop="dateRange">
<el-input v-model="form.sendIp" placeholder="请输入发送地址" /> <el-date-picker
v-model="form.dateRange"
type="daterange"
range-separator="至"
start-placeholder="起始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
@change="dateRangeChange"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="排除设备" prop="excludeDevices"> <el-form-item label="时间间隔" prop="pushingInterval">
<el-select v-model="form.excludeDevices" placeholder="请选择排除设备" clearable multiple style="width:100%" > <el-input type="number" v-model="form.pushingInterval" placeholder="请输入发送时间间隔">
<el-option <template #append>分钟</template>
v-for="dict in listDevices" </el-input>
:key="dict.uuid"
:label="dict.deviceName"
:value="dict.uuid"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-button type="success" icon="Plus" @click="handleAddStrategyConf" :disabled="disabled">选择设备</el-button>
<el-table :data="deviceStrategyConfList" style="width: 100%; margin-top: 10px" height="300px">
<el-table-column type="index" width="50"/>
<el-table-column prop="deviceUuid" label="设备" :formatter="formatterDevicesName"/>
<el-table-column prop="strategy" label="策略" :formatter="formatterStrategy"/>
<el-table-column prop="adjustedValue" label="调整值"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300"
:fixed="fixedColumns ? 'right' : false">
<template #default="scope">
<el-button type="text" icon="Edit" @click="handleUpdateStrategyConf(scope.row)">修改</el-button>
<el-button type="text" icon="Delete" @click="handleDeleteStrategyConf(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -159,17 +189,86 @@
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog title="编辑设备调整策略" v-model="openStrategyConfEditForm" width="500px" append-to-body draggable
:close-on-click-modal="false">
<el-form ref="strategyConfEditFormRef" :model="strategyConfEditForm" :rules="strategyConfEditRules"
label-width="80px">
<el-form-item label="设备：" prop="deviceName">
{{ getDevicesName(strategyConfEditForm.deviceUuid) }}
</el-form-item>
<el-form-item label="策略：" prop="strategy">
<el-select v-model="strategyConfEditForm.strategy" placeholder="请选择策略" style="width: 100%;">
<el-option v-for="dict in effective_strategy" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="调整值：" prop="adjustedValue">
<el-input type="number" v-model="strategyConfEditForm.adjustedValue" placeholder="请输入调整值" :disabled="strategyConfEditForm.strategy !== '1'"/>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitStrategyConfEditForm">确 定</el-button>
<el-button @click="cancelStrategyConfEditForm">取 消</el-button>
</div>
</template>
</el-dialog>
<el-dialog title="新增设备" v-model="openStrategyConfAddForm" width="500px" append-to-body draggable
:close-on-click-modal="false">
<el-form ref="strategyConfSaveFormRef" :model="strategyConfSaveForm" :rules="strategyConfSaveRules"
label-width="70px">
<el-form-item label="设备：" prop="deviceList">
<el-select
v-model="strategyConfSaveForm.deviceList"
multiple
filterable
placeholder="请选择设备"
style="width: 100%"
>
<el-option
v-for="item in deviceList"
:key="item.uuid"
:label="item.deviceName"
:value="item.uuid"
:disabled="item.disabled"
/>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitStrategyConfAddForm">确 定</el-button>
<el-button @click="cancelStrategyConfAddForm">取 消</el-button>
</div>
</template>
</el-dialog>
</div> </div>
</template> </template>
<style lang="scss" > @import "@/assets/styles/self-defined.scss"; <style lang="scss"> @import "@/assets/styles/self-defined.scss";
</style> </style>
<script setup name="Heatapiconf"> <script setup name="Heatapiconf">
import { listHeatapiconf, getHeatapiconf, delHeatapiconf, addHeatapiconf, updateHeatapiconf } from "@/api/model/heatapiconf"; import {
import { listDeviceNoPage } from "@/api/model/device"; listHeatapiconf,
import { deptTreeSelect,deptTreeSelectNew } from "@/api/system/user"; getHeatapiconf,
delHeatapiconf,
addHeatapiconf,
updateHeatapiconf
} from "@/api/model/heatapiconf";
import {
listDcHeatStandardDeviceStrategyConf,
addBatchDcHeatStandardDeviceStrategyConf,
updateDcHeatStandardDeviceStrategyConf
} from "@/api/model/dcHeatStandardDeviceStrategyConf";
import {listDeviceNoPage} from "@/api/model/device";
import {deptTreeSelect, deptTreeSelectNew} from "@/api/system/user";
import lock from "@/assets/icons/svg/lock.svg"; import lock from "@/assets/icons/svg/lock.svg";
import { ElMessageBox } from 'element-plus'; import {ElMessageBox} from 'element-plus';
const { proxy } = getCurrentInstance(); import { nextTick } from 'vue'
const {proxy} = getCurrentInstance();
const {pushing_counterpart, effective_strategy} = proxy.useDict('pushing_counterpart', 'effective_strategy');
const heatapiconfList = ref([]); const heatapiconfList = ref([]);
const open = ref(false); const open = ref(false);
@ -201,13 +300,29 @@ const data = reactive({
pageSize: 10, pageSize: 10,
orgCode: null, orgCode: null,
standard: null, standard: null,
excludeDevices:[], excludeDevices: [],
}, },
rules: { rules: {}
} });
const {queryParams, form, rules} = toRefs(data);
const deviceList = ref([]);
const deviceStrategyConfList = ref([]);
const openStrategyConfEditForm = ref(false);
const strategyConfEditForm = ref({});
const strategyConfEditRules = ref({});
const openStrategyConfAddForm = ref(false);
const strategyConfSaveForm = ref({
deviceList: []
});
const strategyConfSaveRules = ref({
deviceList: [{
required: true,
message: '请选择设备',
trigger: 'change'
}]
}); });
const { queryParams, form, rules } = toRefs(data);
/** 查询供热办推送接口配置列表 */ /** 查询供热办推送接口配置列表 */
function getList() { function getList() {
@ -275,6 +390,8 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
form.value = {};
deviceStrategyConfList.value = [];
form.value.standard = null; form.value.standard = null;
form.value.available = true; form.value.available = true;
form.value.sendIp = null; form.value.sendIp = null;
@ -282,18 +399,17 @@ function handleAdd() {
form.value.computeSwitchTotal = true; form.value.computeSwitchTotal = true;
title.value = "添加供热办推送接口配置"; title.value = "添加供热办推送接口配置";
form.value.excludeDevices = null; form.value.excludeDevices = null;
getListDevice(); if (treeSelected.value != null && treeSelected.value != '') {
if(treeSelected.value != null && treeSelected.value != ''){
editable.value = true; editable.value = true;
}else{ } else {
editable.value = false; editable.value = false;
} }
} }
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); reset();
deviceStrategyConfList.value = [];
const _id = row.id || ids.value const _id = row.id || ids.value
if (_id.length === 0) { if (_id.length === 0) {
ElMessageBox.alert('请选择需要修改的记录', '提示', { ElMessageBox.alert('请选择需要修改的记录', '提示', {
@ -311,13 +427,19 @@ function handleUpdate(row) {
getListDevice(row.orgCode); getListDevice(row.orgCode);
getHeatapiconf(_id).then(response => { getHeatapiconf(_id).then(response => {
form.value = response.data; form.value = response.data;
if(form.value.excludeDevices != null && form.value.excludeDevices?.trim() != ""){ if (form.value.startDate && form.value.endDate) {
form.value.dateRange = [form.value.startDate, form.value.endDate];
}
if (form.value.excludeDevices != null && form.value.excludeDevices?.trim() != "") {
form.value.excludeDevices = form.value.excludeDevices.split(","); form.value.excludeDevices = form.value.excludeDevices.split(",");
}else{ } else {
form.value.excludeDevices = null; form.value.excludeDevices = null;
} // 将机构名称赋值给form对象的orgName属性 } // 将机构名称赋值给form对象的orgName属性
open.value = true; listDcHeatStandardDeviceStrategyConf({confId: _id, pageNum: 1, pageSize: 1000}).then(res => {
title.value = "修改供热办推送接口配置"; deviceStrategyConfList.value = res.rows;
open.value = true;
title.value = "修改供热办推送接口配置";
});
}); });
editable.value = true; editable.value = true;
@ -329,6 +451,7 @@ function submitForm() {
if (valid) { if (valid) {
if (form.value.id != null) { if (form.value.id != null) {
form.value.excludeDevices = form.value.excludeDevices?.join(","); form.value.excludeDevices = form.value.excludeDevices?.join(",");
form.value.deviceStrategyConfList = deviceStrategyConfList.value;
updateHeatapiconf(form.value).then(response => { updateHeatapiconf(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess("修改成功");
open.value = false; open.value = false;
@ -362,7 +485,8 @@ function handleDelete(row) {
}).then(() => { }).then(() => {
getList(); getList();
proxy.$modal.msgSuccess("删除成功"); proxy.$modal.msgSuccess("删除成功");
}).catch(() => { }); }).catch(() => {
});
} }
function getDeptTreeSelectNew() { function getDeptTreeSelectNew() {
@ -450,10 +574,10 @@ onUnmounted(() => {
window.removeEventListener('resize', calculateTableHeight); window.removeEventListener('resize', calculateTableHeight);
}); });
watch( watch(
[collapseVisible, showSearch], [collapseVisible, showSearch],
() => { () => {
calculateTableHeight(); calculateTableHeight();
} }
); );
const calculateTableHeight = () => { const calculateTableHeight = () => {
nextTick(() => { nextTick(() => {
@ -466,11 +590,12 @@ const calculateTableHeight = () => {
tableHeight.value = remainingHeight + 'px'; tableHeight.value = remainingHeight + 'px';
}); });
}; };
function getDeptTreeNew(data) { function getDeptTreeNew(data) {
const result = []; const result = [];
data.forEach(item => { data.forEach(item => {
if (item.orgType === '1003') { if (item.orgType === '1003') {
const newItem = { ...item }; // 使用深拷贝创建新的部门对象 const newItem = {...item}; // 使用深拷贝创建新的部门对象
newItem.children = []; // 将叶节点的 children 属性设置为空数组，不包含子节点 newItem.children = []; // 将叶节点的 children 属性设置为空数组，不包含子节点
newItem.isLeaf = false; newItem.isLeaf = false;
newItem.id = String(item.id); newItem.id = String(item.id);
@ -478,7 +603,7 @@ function getDeptTreeNew(data) {
} else if (item.children) { } else if (item.children) {
const children = getDeptTreeNew(item.children); // 递归调用处理子节点 const children = getDeptTreeNew(item.children); // 递归调用处理子节点
if (children.length > 0) { if (children.length > 0) {
const newItem = { ...item }; // 使用深拷贝创建新的部门对象 const newItem = {...item}; // 使用深拷贝创建新的部门对象
newItem.children = children; newItem.children = children;
newItem.isLeaf = true; newItem.isLeaf = true;
newItem.id = String(item.id); newItem.id = String(item.id);
@ -490,97 +615,231 @@ function getDeptTreeNew(data) {
} }
function changeEnabled(row){ function changeEnabled(row) {
ElMessageBox.confirm('确定修改该推送状态吗', '提示', { ElMessageBox.confirm('确定修改该推送状态吗', '提示', {
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
})
.then(() => {
console.log("确定");
let param = {
id:row.id,
available:row.available
}
updateHeatapiconf(param);
})
.catch((action) => {
console.log("取消");
row.available = !row.available;
}) })
.then(() => {
console.log("确定");
let param = {
id: row.id,
available: row.available
}
updateHeatapiconf(param);
})
.catch((action) => {
console.log("取消");
row.available = !row.available;
})
} }
function turnToParamConf(row){ function turnToParamConf(row) {
router.push({ router.push({
path: "heatParamModel", path: "heatParamModel",
query: { query: {
standardConfId:row.id, standardConfId: row.id,
} }
}); });
} }
function getListDevice(orgCode) { function getListDevice(orgCode) {
let param = {}; let param = {};
if(orgCode != null && typeof orgCode === 'string'){ if (orgCode != null && typeof orgCode === 'string') {
param.orgCode = orgCode; param.orgCode = orgCode;
}else{ } else {
param.orgCode = form.value.orgCode; param.orgCode = form.value.orgCode;
} }
listDeviceNoPage(param).then(response => { listDeviceNoPage(param).then(response => {
listDevices.value = response.data; listDevices.value = response.data;
console.log("设备", listDevices.value);
}); });
} }
function getDevicesNames(deviceIds){ function getDevicesNames(deviceIds) {
if(!deviceIds) return ''; if (!deviceIds) return '';
let deviceIdSet = new Set(deviceIds.split(',')); let deviceIdSet = new Set(deviceIds.split(','));
let deviceMap = new Map(); let deviceMap = new Map();
listDeviceAll.value.forEach(device => { listDeviceAll.value.forEach(device => {
deviceMap.set(device.uuid, device.deviceName); deviceMap.set(device.uuid, device.deviceName);
}); });
let deviceNames = []; let deviceNames = [];
for (let deviceId of deviceIdSet) { for (let deviceId of deviceIdSet) {
let name = deviceMap.get(deviceId); let name = deviceMap.get(deviceId);
if (name) { if (name) {
deviceNames.push(name); deviceNames.push(name);
} else { } else {
console.log("该设备没能匹配到对应设备名称："+deviceId) console.log("该设备没能匹配到对应设备名称：" + deviceId)
}
} }
} return deviceNames.join(',');
return deviceNames.join(',');
} }
function getDevicesAll(){ function getDevicesAll() {
listDeviceNoPage().then(response => { listDeviceNoPage().then(response => {
listDeviceAll.value = response.data; listDeviceAll.value = response.data;
}); });
} }
function changeSwitch(row){ function changeSwitch(row) {
ElMessageBox.confirm('确定修改该计算启用状态吗', '提示', { ElMessageBox.confirm('确定修改该计算启用状态吗', '提示', {
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
}) })
.then(() => { .then(() => {
console.log("确定"); console.log("确定");
let param = { let param = {
id:row.id, id: row.id,
computeSwitchTotal:row.computeSwitchTotal computeSwitchTotal: row.computeSwitchTotal
}
updateHeatapiconf(param);
})
.catch((action) => {
console.log("取消");
row.computeSwitchTotal = !row.computeSwitchTotal;
})
}
/**
* 格式化推送方
* @param row
* @param column
* @param cellValue
* @param index
*/
function formatterPushingCounterpart(row, column, cellValue, index) {
if (pushing_counterpart.value && pushing_counterpart.value.length > 0) {
let arr = pushing_counterpart.value.filter(item => {
if (item.value == cellValue) {
return item;
}
})
if (arr && arr.length > 0) {
return arr[0].label;
}
}
}
/**
* 格式化策略
* @param row
* @param column
* @param cellValue
* @param index
*/
function formatterStrategy(row, column, cellValue, index) {
if (effective_strategy.value && effective_strategy.value.length > 0) {
let arr = effective_strategy.value.filter(item => {
if (item.value == cellValue) {
return item;
}
})
if (arr && arr.length > 0) {
return arr[0].label;
}
}
}
/**
* 日期范围改变
* @param dataRange
*/
function dateRangeChange(dataRange) {
if (dataRange && dataRange.length > 0) {
form.value.startDate = dataRange[0];
form.value.endDate = dataRange[1];
}
}
function handleAddStrategyConf() {
deviceList.value = JSON.parse(JSON.stringify(listDevices.value));
console.log("deviceList", deviceList.value, deviceStrategyConfList.value);
if (deviceStrategyConfList.value && deviceStrategyConfList.value.length > 0) {
deviceList.value.forEach(device => {
let arr = deviceStrategyConfList.value.filter(item => item.deviceUuid === device.uuid);
if (arr && arr.length > 0) {
device.disabled = true;
}
})
}
strategyConfSaveForm.value.deviceList = [];
openStrategyConfAddForm.value = true;
nextTick(() => {
if (proxy.$refs["strategyConfSaveFormRef"]) {
proxy.$refs["strategyConfSaveFormRef"].clearValidate();
} }
updateHeatapiconf(param);
}) })
.catch((action) => { }
console.log("取消");
row.computeSwitchTotal = !row.computeSwitchTotal; function handleUpdateStrategyConf(row) {
strategyConfEditForm.value = row;
openStrategyConfEditForm.value = true;
}
function handleDeleteStrategyConf(index) {
console.log("index", index);
proxy.$modal.confirm('是否确认删除该设备？').then(function () {
deviceStrategyConfList.value.splice(index, 1);
})
}
function submitStrategyConfEditForm() {
proxy.$refs["strategyConfEditFormRef"].validate(valid => {
if (valid) {
cancelStrategyConfEditForm();
}
});
}
function cancelStrategyConfEditForm() {
openStrategyConfEditForm.value = false;
}
function submitStrategyConfAddForm() {
proxy.$refs["strategyConfSaveFormRef"].validate(valid => {
if (valid) {
console.log("deviceStrategyConfList", deviceStrategyConfList.value);
listDevices.value.filter(obj => strategyConfSaveForm.value.deviceList.includes(obj.uuid)).forEach(obj => {
deviceStrategyConfList.value.push({
deviceUuid: obj.uuid,
strategy: 0
});
});
cancelStrategyConfAddForm();
}
}) })
}
function cancelStrategyConfAddForm() {
openStrategyConfAddForm.value = false;
}
function formatterDevicesName(row, column, cellValue, index) {
let arr = listDevices.value.filter(obj => obj.uuid === cellValue);
if (arr && arr.length > 0) {
return arr[0].deviceName;
} else {
return '';
}
}
function getDevicesName(deviceUuid) {
let arr = listDevices.value.filter(obj => obj.uuid === deviceUuid);
if (arr && arr.length > 0) {
return arr[0].deviceName;
} else {
return '';
}
} }
getDevicesAll(); getDevicesAll();
getDeptTree(); getDeptTree();
getDeptTreeSelectNew(); getDeptTreeSelectNew();
getList(); getList();
</script> </script>

82
src/views/model/heatapiconf/paramModel.vue
View File

@ -42,6 +42,11 @@
{{ getParamClassName(scope.row.paramClassId) }} {{ getParamClassName(scope.row.paramClassId) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="推送方参数" align="center" prop="paramClassId">
<template #default="scope">
{{ scope.row.pushingCounterpartParam }}
</template>
</el-table-column>
<el-table-column label="是否启用计算" align="center" prop="computeSwitch"> <el-table-column label="是否启用计算" align="center" prop="computeSwitch">
<template #default="scope"> <template #default="scope">
<el-switch v-model="scope.row.computeSwitch" @change="changeSwitch(scope.row)"/> <el-switch v-model="scope.row.computeSwitch" @change="changeSwitch(scope.row)"/>
@ -49,7 +54,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<!-- <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button> --> <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
<el-button type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> <el-button type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -59,7 +64,7 @@
@pagination="getList" /> @pagination="getList" />
<!-- 添加或修改热源推送参数配置对话框 --> <!-- 添加或修改热源推送参数配置对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body draggable> <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable destroy-on-close>
<el-form ref="heatParamModelRef" :model="form" :rules="rules" label-width="100px"> <el-form ref="heatParamModelRef" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -71,7 +76,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>
@ -81,6 +85,23 @@
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog title="编辑" v-model="openEdit" width="500px" append-to-body draggable destroy-on-close>
<el-form ref="heatParamModelEditRef" :model="editForm" :rules="editRules" label-width="110px">
<el-form-item label="参数模版：" prop="paramClassId">
{{paramClassFormat(editForm.paramClassId)}}
</el-form-item>
<el-form-item label="推送方参数：" prop="pushingCounterpartParam">
<el-input v-model="editForm.pushingCounterpartParam" placeholder="请输入推送方参数"></el-input>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitEditForm">确 定</el-button>
<el-button @click="cancelEdit">取 消</el-button>
</div>
</template>
</el-dialog>
</div> </div>
</template> </template>
<style lang="scss" > @import "@/assets/styles/self-defined.scss"; <style lang="scss" > @import "@/assets/styles/self-defined.scss";
@ -101,6 +122,7 @@ const { proxy } = getCurrentInstance();
const heatParamModelList = ref([]); const heatParamModelList = ref([]);
const open = ref(false); const open = ref(false);
const openEdit = ref(false);
const loading = ref(true); const loading = ref(true);
const showSearch = ref(true); const showSearch = ref(true);
const ids = ref([]); const ids = ref([]);
@ -130,6 +152,10 @@ const data = reactive({
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
const editForm = ref({});
const editRules = ref({
pushingCounterpartParam: [{ required: true, message: "推送方参数不能为空", trigger: "blur" }],
});
/** 查询热源推送参数配置列表 */ /** 查询热源推送参数配置列表 */
function getList() { function getList() {
@ -211,22 +237,31 @@ function handleAdd() {
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); editForm.value = row;
paramClassSelectedOld.value = []; openEdit.value = true;
paramClassListNew.value = paramClassList.value; // proxy.resetForm("heatParamModelEditRef");
let param = { }
standardConfId:standardConfId
} function submitEditForm() {
listHeatParamModelNoPage(param).then(response => { proxy.$refs["heatParamModelEditRef"].validate(valid => {
response.data?.forEach(item=>{ if (valid) {
paramClassSelectedOld.value.push(item.paramClassId); if (editForm.value.id != null) {
}); updateHeatParamModel(editForm.value).then(response => {
form.value.paramClassId = paramClassSelectedOld.value; proxy.$modal.msgSuccess("保存成功");
open.value = true; openEdit.value = false;
title.value = "修改热源推送参数配置"; getList();
});
}
}
}); });
} }
function cancelEdit() {
proxy.$refs["heatParamModelEditRef"].resetFields();
openEdit.value = false;
getList();
}
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["heatParamModelRef"].validate(valid => { proxy.$refs["heatParamModelRef"].validate(valid => {
@ -310,8 +345,9 @@ function getHeatList() {
function getHeatName(standardConfId) { function getHeatName(standardConfId) {
console.log(standardConfId, heatList.value)
for (let item of heatList.value) { for (let item of heatList.value) {
if (String(item.id) === standardConfId) { if (String(item.id) === String(standardConfId)) {
return item.orgName return item.orgName
} }
} }
@ -378,7 +414,17 @@ function theSameToEachOther(row){
} }
} }
function paramClassFormat(paramClassId) {
console.log(paramClassId, paramClassList.value)
let paramClassName = '';
if (paramClassId) {
let arr = paramClassList.value.filter((item) => item.paramClassCode === paramClassId)
if (arr && arr.length > 0) {
paramClassName = arr[0].paramClassName;
}
}
return paramClassName;
}
getHeatList(); getHeatList();
getParamModel(); getParamModel();

Write Preview
Loading…
Cancel
Save