Browse Source

Merge remote-tracking branch 'origin/develop' into develop

develop
eric777 8 months ago
parent
commit
f2ea2f369d
  1. 2
      .env.development
  2. 55
      src/api/model/asset/params.js
  3. 67
      src/api/model/dcHeatStandardDeviceStrategyConf.js
  4. 130
      src/store/modules/user.js
  5. 533
      src/views/model/asset/addParams.vue
  6. 282
      src/views/model/asset/index.vue
  7. 194
      src/views/model/asset/params.vue
  8. 654
      src/views/model/heatapiconf/index.vue
  9. 82
      src/views/model/heatapiconf/paramModel.vue

2
.env.development

@ -5,5 +5,5 @@ VITE_APP_TITLE = 联美运营系统
VITE_APP_ENV = 'development' VITE_APP_ENV = 'development'
# 联美运营系统/开发环境 # 联美运营系统/开发环境
VITE_APP_BASE_API = 'http://localhost:9010' VITE_APP_BASE_API = 'http://10.10.10.56:9010'
VITE_APP_BASE_API_IMAGE = 'http://localhost:9010' VITE_APP_BASE_API_IMAGE = 'http://localhost:9010'

55
src/api/model/asset/params.js

@ -1,53 +1,62 @@
import request from '@/utils/request' import request from "@/utils/request";
// 查询资产参数列表 // 查询资产参数列表
export function listParams(query) { export function listParams(query) {
return request({ return request({
url: '/model/dcBaseAssetParams/list', url: "/model/dcBaseAssetParams/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
// 查询资产参数详细 // 查询资产参数详细
export function getParams(id) { export function getParams(id) {
return request({ return request({
url: '/model/dcBaseAssetParams/' + id, url: "/model/dcBaseAssetParams/" + id,
method: 'get' method: "get",
}) });
} }
// 新增资产参数 // 新增资产参数
export function addParams(data) { export function addParams(data) {
return request({ return request({
url: '/model/dcBaseAssetParams', url: "/model/dcBaseAssetParams",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 修改资产参数 // 修改资产参数
export function updateParams(data) { export function updateParams(data) {
return request({ return request({
url: '/model/dcBaseAssetParams', url: "/model/dcBaseAssetParams",
method: 'put', method: "put",
data: data data: data,
}) });
} }
// 删除资产参数 // 删除资产参数
export function delParams(id) { export function delParams(id) {
return request({ return request({
url: '/model/dcBaseAssetParams/' + id, url: "/model/dcBaseAssetParams/" + id,
method: 'delete' method: "delete",
}) });
} }
// 导出资产参数 // 导出资产参数
export function exportParams(query) { export function exportParams(query) {
return request({ return request({
url: '/${baseUrl}/export', url: "/${baseUrl}/export",
method: 'get', method: "get",
params: query params: query,
}) });
}
// 根据设备查询设备参数列表
export function listByDeviceUuids(data) {
return request({
url: "/model/dcBaseDeviceParam/listByDeviceUuids",
method: "post",
data: data,
});
} }

67
src/api/model/dcHeatStandardDeviceStrategyConf.js

@ -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
})
}

130
src/store/modules/user.js

@ -1,70 +1,78 @@
import { login, logout, getInfo } from '@/api/login' import { login, logout, getInfo } from "@/api/login";
import { getToken, setToken, removeToken } from '@/utils/auth' import { getToken, setToken, removeToken } from "@/utils/auth";
import defAva from '@/assets/images/profile.jpg' import defAva from "@/assets/images/profile.jpg";
const useUserStore = defineStore( const useUserStore = defineStore("user", {
'user', state: () => ({
{ token: getToken(),
state: () => ({ name: "",
token: getToken(), avatar: "",
name: '', roles: [],
avatar: '', permissions: [],
roles: [], }),
permissions: [] actions: {
}), // 登录
actions: { login(userInfo) {
// 登录 const username = userInfo.username.trim();
login(userInfo) { const password = userInfo.password;
const username = userInfo.username.trim() const code = userInfo.code;
const password = userInfo.password const uuid = userInfo.uuid;
const code = userInfo.code return new Promise((resolve, reject) => {
const uuid = userInfo.uuid login(username, password, code, uuid)
return new Promise((resolve, reject) => { .then((res) => {
login(username, password, code, uuid).then(res => { setToken(res.token);
setToken(res.token) this.token = res.token;
this.token = res.token resolve();
resolve()
}).catch(error => {
reject(error)
}) })
}) .catch((error) => {
}, reject(error);
// 获取用户信息 });
getInfo() { });
return new Promise((resolve, reject) => { },
getInfo().then(res => { // 获取用户信息
const user = res.user getInfo() {
const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar; return new Promise((resolve, reject) => {
getInfo()
.then((res) => {
const user = res.user;
const avatar =
user.avatar == "" || user.avatar == null
? defAva
: import.meta.env.VITE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (res.roles && res.roles.length > 0) {
this.roles = res.roles // 验证返回的roles是否是一个非空数组
this.permissions = res.permissions this.roles = res.roles;
this.permissions = res.permissions;
} else { } else {
this.roles = ['ROLE_DEFAULT'] this.roles = ["ROLE_DEFAULT"];
} }
this.name = user.userName this.name = user.userName;
this.avatar = avatar; this.avatar = avatar;
resolve(res) resolve(res);
}).catch(error => {
reject(error)
}) })
}) .catch((error) => {
}, reject(error);
// 退出系统 });
logOut() { });
return new Promise((resolve, reject) => { },
logout(this.token).then(() => { // 退出系统
this.token = '' logOut() {
this.roles = [] return new Promise((resolve, reject) => {
this.permissions = [] logout(this.token)
removeToken() .then(() => {
resolve() this.token = "";
}).catch(error => { this.roles = [];
reject(error) this.permissions = [];
removeToken();
resolve();
}) })
}) .catch((error) => {
} reject(error);
} });
}) });
},
},
});
export default useUserStore export default useUserStore;

533
src/views/model/asset/addParams.vue

@ -0,0 +1,533 @@
<template>
<div class="app-container">
<div class="submitBtn">
<el-button
type="primary"
:icon="submitIcon"
@click="paramSubmit(paramsFormRef)"
>
{{ paramsText }}
</el-button>
</div>
<el-collapse class="paramsCollapse" v-model="activeNames">
<el-collapse-item title="基本信息" name="1">
<el-form
ref="paramsFormRef"
class="paramsForm"
:rules="paramsRules"
:inline="true"
:model="formData.paramsForm"
>
<el-form-item label="组织" prop="orgName">
<el-tree-select
v-model="formData.paramsForm.orgName"
:data="deptOptions"
:props="{
value: 'label',
label: 'label',
children: 'children',
}"
value-key="id"
placeholder="请选择"
check-strictly
:default-expand-all="true"
@node-click="selectDept"
/>
</el-form-item>
<el-form-item label="编码" prop="assetCode">
<el-input
v-model="formData.paramsForm.assetCode"
placeholder="编码"
clearable
/>
</el-form-item>
<el-form-item label="是否可用" prop="flagEnabled">
<el-select
v-model="formData.paramsForm.flagEnabled"
placeholder="请选择是否可用"
>
<el-option
v-for="dict in enabledFlag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="名称" prop="assetName">
<el-input
v-model="formData.paramsForm.assetName"
placeholder="名称"
clearable
/>
</el-form-item>
<el-form-item label="类别" prop="assetType">
<el-select
v-model="formData.paramsForm.assetType"
placeholder="请选择类别"
clearable
>
<el-option
v-for="dict in dc_asset_attr"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<div>
<el-form-item label="组成设备">
<el-select
v-model="paramsDevice"
multiple
filterable
allow-create
default-first-option
collapse-tags
collapse-tags-tooltip
:max-collapse-tags="3"
:reserve-keyword="false"
placeholder="组成设备"
style="width: 240px"
>
<el-option
v-for="item in deviceOption"
:key="item.id"
:label="item.deviceName"
:value="item.centerDeviceCode"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="success" @click="selectParams"
>选择参数</el-button
>
</el-form-item>
</div>
</el-form>
</el-collapse-item>
<el-collapse-item title="参数列表" name="2">
<vxe-toolbar>
<template #buttons>
<vxe-button
status="danger"
content="删除"
icon="vxe-icon-delete"
@click="removeEvent()"
></vxe-button>
</template>
</vxe-toolbar>
<vxe-table
class="tableCollapse"
border
ref="paramsTableRef"
max-height="400"
:row-config="{ isHover: true }"
:loading="loading"
:data="paramsList"
>
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column field="paramCode" title="参数编码"></vxe-column>
<vxe-column
field="paramName"
title="参数名称"
:filters="addressOptions"
:filter-method="filterParamName"
:filter-recover-method="filterParamNameRecover"
>
<template #filter="{ $panel, column }">
<vxe-input
class="filterInput"
v-for="(option, index) in column.filters"
:key="index"
v-model="option.data"
@input="$panel.changeOption($event, !!option.data, option)"
@keyup.enter="$panel.confirmFilter()"
placeholder="参数名称"
size="mini"
></vxe-input>
</template>
</vxe-column>
<vxe-column field="flagEnabled" title="是否有效">
<template #default="{ row }">
<vxe-checkbox v-model="row.flagEnabled"></vxe-checkbox>
</template>
</vxe-column>
<vxe-column field="contrlFlag" title="是否可控">
<template #default="{ row }">
<vxe-checkbox v-model="row.contrlFlag"></vxe-checkbox>
</template>
</vxe-column>
<vxe-column title="操作" width="100" show-overflow>
<template #default="{ row }">
<vxe-button
type="text"
icon="vxe-icon-delete"
@click="removeEvent(row)"
></vxe-button>
</template>
</vxe-column>
</vxe-table>
</el-collapse-item>
</el-collapse>
<el-dialog
class="addDialog"
v-model="dialogTableVisible"
title="选择参数"
width="1200"
>
<vxe-table
class="tableDialog"
border
ref="addTableRef"
max-height="400"
:row-config="{ isHover: true }"
:loading="loading"
:data="paramsData"
>
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column field="deviceUuid" title="设备编码" sortable></vxe-column>
<vxe-column field="deviceName" title="设备名称"></vxe-column>
<vxe-column field="paramCode" title="参数编码"></vxe-column>
<vxe-column
field="paramModelName"
title="参数模版名称"
:filters="ageOptions"
:filter-method="filterParamModel"
:filter-recover-method="filterParamModelRecover"
>
<template #filter="{ $panel, column }">
<vxe-input
class="filterInput"
v-for="(option, index) in column.filters"
:key="index"
v-model="option.data"
@input="$panel.changeOption($event, !!option.data, option)"
@keyup.enter="$panel.confirmFilter()"
placeholder="参数模版名称"
size="mini"
></vxe-input>
</template>
</vxe-column>
<vxe-column
field="paramName"
title="参数名称"
:filters="addressOptions"
:filter-method="filterParamNameSel"
:filter-recover-method="filterParamNameRecoverSel"
>
<template #filter="{ $panel, column }">
<vxe-input
class="filterInput"
v-for="(option, index) in column.filters"
:key="index"
v-model="option.data"
@input="$panel.changeOption($event, !!option.data, option)"
@keyup.enter="$panel.confirmFilter()"
placeholder="参数名称"
size="mini"
></vxe-input>
</template>
</vxe-column>
<vxe-column
field="partion"
title="分区"
:filter-multiple="false"
:filters="sexOptions"
></vxe-column>
</vxe-table>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogTableVisible = false">取消</el-button>
<el-button type="primary" @click="addConfirm"> 确认 </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref, reactive, onMounted } from "vue";
import { ElMessage } from "element-plus";
import { deptTreeSelect } from "@/api/system/user";
import {
listByDeviceUuids,
listParams,
delParams,
} from "@/api/model/asset/params";
import { listDeviceNoPage } from "@/api/model/device";
import {
listInfo,
getInfo,
delInfo,
addInfo,
updateInfo,
} from "@/api/model/asset/info";
import { Check } from "@element-plus/icons-vue";
const { proxy } = getCurrentInstance();
const { dc_asset_attr } = proxy.useDict("dc_asset_attr");
const activeNames = ref(["1", "2"]);
const route = useRoute();
const router = useRouter();
const id = route.query.id;
const ids = ref();
const submitIcon = ref("Plus");
const paramsText = ref("新增");
const paramsFormRef = ref();
const dialogTableVisible = ref(false);
const deptOptions = ref([]);
const paramsData = ref([]);
const paramsList = ref([]);
const paramsCode = ref([]);
const paramsDevice = ref([]);
const deviceOption = ref([]);
const enabledFlag = ref([
{ label: "可用", value: 1, elTagType: "default", elTagClass: null },
{ label: "不可用", value: 0, elTagType: "default", elTagClass: null },
]);
const formData = reactive({
paramsForm: {
assetCode: "",
flagEnabled: null,
assetName: "",
assetType: "",
orgCode: null,
orgName: "",
assetParamsDtos: [
{
paramCode: "",
flagEnabled: false,
contrlFlag: false,
},
],
},
});
const paramsTableRef = ref();
const addTableRef = ref();
const loading = ref(false);
const sexOptions = ref([
{ label: "A", value: "A" },
{ label: "B", value: "B" },
{ label: "C", value: "C" },
{ label: "D", value: "D" },
]);
const ageOptions = ref([{ data: "" }]);
const addressOptions = ref([{ data: "" }]);
const paramsRules = reactive({
orgName: [{ required: true, message: "请选择组织", trigger: "change" }],
assetCode: [{ required: true, message: "请输入编码", trigger: "blur" }],
flagEnabled: [
{ required: true, message: "请选择是否可用", trigger: "change" },
],
assetName: [{ required: true, message: "请输入资产名称", trigger: "blur" }],
assetType: [{ required: true, message: "请选择类别", trigger: "change" }],
});
const filterParamModel = ({ option, row }) => {
//
return row.paramModelName === option.data;
};
const filterParamModelRecover = ({ option }) => {
//
option.data = "";
};
const filterParamName = ({ option, row }) => {
//
return row.paramName === option.data;
};
const filterParamNameRecover = ({ option }) => {
//
option.data = "";
};
const filterParamNameSel = ({ option, row }) => {
//
return row.paramName === option.data;
};
const filterParamNameRecoverSel = ({ option }) => {
//
option.data = "";
};
onMounted(() => {
if (route.query.id != undefined) {
getBasicInfo();
getParamsList();
}
getDeptTree();
getDevice();
});
function getBasicInfo() {
getInfo(route.query.id).then((response) => {
formData.paramsForm = response.data;
submitIcon.value = "Check";
paramsText.value = "修改";
});
}
function getParamsList() {
//
const params = {
assetCode: route.query.assetCode,
};
listParams(params).then((res) => {
if (res.code === 200) {
paramsList.value = res.rows;
paramsCode.value = paramsList.value.map((item) => item.paramCode);
}
});
}
function getDeptTree() {
//
deptTreeSelect().then((response) => {
deptOptions.value = response.data;
});
}
function getDevice() {
//
listDeviceNoPage().then((response) => {
deviceOption.value = response.data;
});
}
function selectParams() {
//
if (paramsDevice.value.length != 0) {
const params = {
deviceUuids: paramsDevice.value,
excludeParamCodes: paramsCode.value,
};
listByDeviceUuids(params).then((res) => {
if (res.code === 200) {
paramsData.value = res.data;
dialogTableVisible.value = true;
}
});
} else {
ElMessage({
message: "请先选择组成设备!",
type: "warning",
});
}
}
function selectDept(val) {
//
formData.paramsForm.orgCode = val.id;
}
function addConfirm() {
//
const $addTable = addTableRef.value;
if ($addTable) {
const selectRecords = $addTable.getCheckboxRecords();
selectRecords.map((item) => {
paramsList.value.push({
...item,
flagEnabled: false,
contrlFlag: false,
});
});
paramsCode.value = paramsList.value.map((item) => item.paramCode);
console.log(paramsList.value, paramsCode.value);
dialogTableVisible.value = false;
}
}
const removeEvent = async (row) => {
//
if (row) {
ids.value = row.id;
} else {
const $submitTable = paramsTableRef.value;
ids.value = $submitTable.getCheckboxRecords().map((item) => item.id);
if (ids.value.length === 0) {
ElMessage({
message: "请选择删除数据!",
type: "warning",
});
return;
}
}
if (route.query.id != undefined) {
proxy.$modal
.confirm("是否确认删除数据项?")
.then(function () {
return delParams(ids.value);
})
.then(() => {
getParamsList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {});
} else {
const $submitTable = paramsTableRef.value;
const selectParamsList = $submitTable.getCheckboxRecords();
if ($submitTable) {
$submitTable.remove(row || selectParamsList);
paramsList.value = $submitTable.getTableData().tableData;
paramsCode.value = paramsList.value.map((item) => item.paramCode);
console.log(paramsList.value);
}
}
};
const paramSubmit = async (formEl) => {
//
if (!formEl) return;
await formEl.validate((valid, fields) => {
if (valid) {
const $submitTable = paramsTableRef.value;
if ($submitTable) {
if (route.query.id != undefined) {
const selectParamsList = $submitTable.getCheckboxRecords();
console.log(selectParamsList);
const selectParamsListArr = selectParamsList.map((item) => ({
id: item.id,
paramCode: item.paramCode,
flagEnabled: item.flagEnabled,
contrlFlag: item.contrlFlag,
}));
formData.paramsForm.assetParamsDtos = selectParamsListArr;
updateInfo(formData.paramsForm).then((response) => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
});
} else {
const selectParamsList = $submitTable.getCheckboxRecords();
const selectParamsListArr = selectParamsList.map((item) => ({
paramCode: item.paramCode,
flagEnabled: item.flagEnabled,
contrlFlag: item.contrlFlag,
}));
formData.paramsForm.assetParamsDtos = selectParamsListArr;
addInfo(formData.paramsForm).then((response) => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
});
}
router.push({
path: "AssetInfo",
});
console.log(formData.paramsForm);
}
} else {
console.log("error submit!", fields);
}
});
};
</script>
<style scoped>
.paramsCollapse {
.tableCollapse {
.filterInput {
width: 120px;
margin: 10px;
}
}
}
:deep(.addDialog) {
.tableDialog {
.filterInput {
width: 120px;
margin: 10px;
}
}
}
</style>

282
src/views/model/asset/index.vue

@ -3,52 +3,110 @@
<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
:filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all :data="deptOptions"
@node-click="handleNodeClick" /> :props="{ label: 'label', children: 'children' }"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="deptTreeRef"
node-key="id"
highlight-current
default-expand-all
@node-click="handleNodeClick"
/>
</div> </div>
</el-col> </el-col>
<el-col :span="20" class="card-box"> <el-col :span="20" class="card-box">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px"> <el-form
:model="queryParams"
ref="queryRef"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="编码" prop="assetCode"> <el-form-item label="编码" prop="assetCode">
<el-input v-model="queryParams.assetCode" placeholder="请输入编码" clearable @keyup.enter="handleQuery" /> <el-input
v-model="queryParams.assetCode"
placeholder="请输入编码"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="是否有效" prop="flagEnabled"> <!-- <el-form-item label="是否有效" prop="flagEnabled">
<el-input v-model="queryParams.flagEnabled" placeholder="请输入是否有效" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.flagEnabled" placeholder="请输入是否有效" clearable @keyup.enter="handleQuery" />
</el-form-item> --> </el-form-item> -->
<el-form-item label="名称" prop="assetName"> <el-form-item label="名称" prop="assetName">
<el-input v-model="queryParams.assetName" placeholder="请输入名称" clearable @keyup.enter="handleQuery" /> <el-input
v-model="queryParams.assetName"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="类别" prop="assetType"> <el-form-item label="类别" prop="assetType">
<el-select v-model="queryParams.assetType" placeholder="请选择类别" clearable> <el-select
<el-option v-for="dict in dc_asset_attr" :key="dict.value" :label="dict.label" :value="dict.value" /> v-model="queryParams.assetType"
placeholder="请选择类别"
clearable
>
<el-option
v-for="dict in dc_asset_attr"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery"
<el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button> >搜索</el-button
>
<el-button type="info" plain icon="Refresh" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="Plus" @click="handleAdd">新增</el-button> <el-button type="success" icon="Plus" @click="handleAdd"
>新增</el-button
>
</el-col> </el-col>
<!-- <el-col :span="1.5">
<el-button type="success" icon="Edit" @click="handleUpdate"
>修改</el-button
>
</el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="Edit" @click="handleUpdate">修改</el-button> <el-button type="success" icon="Delete" @click="handleDelete"
>删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="Delete" @click="handleDelete">删除</el-button> <el-button type="warning" icon="Download" @click="handleExport"
>导出</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <right-toolbar
<el-button type="warning" icon="Download" @click="handleExport">导出</el-button> v-model:showSearch="showSearch"
</el-col> @queryTable="getList"
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="infoList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键" align="center" prop="id" /> --> <!-- <el-table-column label="主键" align="center" prop="id" /> -->
<el-table-column label="编码" align="center" prop="assetCode" /> <el-table-column label="编码" align="center" prop="assetCode" />
@ -59,19 +117,43 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组织" align="center" prop="orgName" /> <el-table-column label="组织" align="center" prop="orgName" />
<el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
width="350"
class-name="small-padding fixed-width"
>
<template #default="scope"> <template #default="scope">
<el-button type="text" icon="Edit" @click="handleParams(scope.row)">参数</el-button> <el-button
type="text"
icon="Edit"
@click="handleParams(scope.row)"
>参数</el-button
>
<!-- <el-button type="text" icon="Edit" @click="handleDevices(scope.row)">关联设备</el-button> --> <!-- <el-button type="text" icon="Edit" @click="handleDevices(scope.row)">关联设备</el-button> -->
<el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button> <el-button
<el-button type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" <pagination
v-model:limit="queryParams.pageSize" @pagination="getList" /> v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</el-col> </el-col>
</el-row> </el-row>
@ -81,14 +163,29 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="组织" prop="orgName"> <el-form-item label="组织" prop="orgName">
<el-tree-select v-model="form.orgName" :data="deptOptions" <el-tree-select
:props="{ value: 'label', label: 'label', children: 'children' }" value-key="id" placeholder="请选择" v-model="form.orgName"
check-strictly :default-expand-all="true" @node-click="selectDept" /> :data="deptOptions"
:props="{
value: 'label',
label: 'label',
children: 'children',
}"
value-key="id"
placeholder="请选择"
check-strictly
:default-expand-all="true"
@node-click="selectDept"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-show="false"> <el-col :span="12" v-show="false">
<el-form-item label="所属组织编码" prop="orgCode"> <el-form-item label="所属组织编码" prop="orgCode">
<el-input v-model="form.orgCode" placeholder="请选择组织名称" disabled /> <el-input
v-model="form.orgCode"
placeholder="请选择组织名称"
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -98,8 +195,16 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否可用" prop="flagEnabled"> <el-form-item label="是否可用" prop="flagEnabled">
<el-select v-model="form.flagEnabled" placeholder="请选择是否可用"> <el-select
<el-option v-for="dict in enabledFlag" :key="dict.value" :label="dict.label" :value="dict.value" /> v-model="form.flagEnabled"
placeholder="请选择是否可用"
>
<el-option
v-for="dict in enabledFlag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -111,12 +216,15 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="类别" prop="assetType"> <el-form-item label="类别" prop="assetType">
<el-select v-model="form.assetType" placeholder="请选择类别"> <el-select v-model="form.assetType" placeholder="请选择类别">
<el-option v-for="dict in dc_asset_attr" :key="dict.value" :label="dict.label" <el-option
:value="dict.value"></el-option> v-for="dict in dc_asset_attr"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</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>
@ -130,11 +238,17 @@
</template> </template>
<script setup name="AssetInfo"> <script setup name="AssetInfo">
import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/model/asset/info"; import {
listInfo,
getInfo,
delInfo,
addInfo,
updateInfo,
} from "@/api/model/asset/info";
import { deptTreeSelect } from "@/api/system/user"; import { deptTreeSelect } from "@/api/system/user";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { dc_asset_attr } = proxy.useDict('dc_asset_attr'); const { dc_asset_attr } = proxy.useDict("dc_asset_attr");
const router = useRouter(); const router = useRouter();
const infoList = ref([]); const infoList = ref([]);
const open = ref(false); const open = ref(false);
@ -147,8 +261,8 @@ const total = ref(0);
const title = ref(""); const title = ref("");
const enabledFlag = ref([ const enabledFlag = ref([
{ label: '可用', value: 1, elTagType: 'default', elTagClass: null }, { label: "可用", value: 1, elTagType: "default", elTagClass: null },
{ label: '不可用', value: 0, elTagType: 'default', elTagClass: null } { label: "不可用", value: 0, elTagType: "default", elTagClass: null },
]); ]);
const data = reactive({ const data = reactive({
@ -162,10 +276,9 @@ const data = reactive({
assetName: null, assetName: null,
assetType: null, assetType: null,
orgCode: null, orgCode: null,
orgName: null orgName: null,
}, },
rules: { rules: {},
}
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
@ -173,7 +286,7 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询资产信息列表 */ /** 查询资产信息列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
listInfo(queryParams.value).then(response => { listInfo(queryParams.value).then((response) => {
infoList.value = response.rows; infoList.value = response.rows;
total.value = response.total; total.value = response.total;
loading.value = false; loading.value = false;
@ -205,12 +318,11 @@ function reset() {
assetName: null, assetName: null,
assetType: null, assetType: null,
orgCode: null, orgCode: null,
orgName: null orgName: null,
}; };
proxy.resetForm("infoRef"); proxy.resetForm("infoRef");
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
@ -225,20 +337,19 @@ function resetQuery() {
// //
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id); ids.value = selection.map((item) => item.id);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }
/** 跳转参数 */ /** 跳转参数 */
function handleParams(row) { function handleParams(row) {
router.push({ router.push({
path: "AssetParams", path: "AssetParams",
query: { query: {
id: row.id, id: row.id,
assetCode: row.assetCode assetCode: row.assetCode,
} },
}); });
} }
/** 跳转关联设备 */ /** 跳转关联设备 */
@ -247,41 +358,52 @@ function handleDevice(row) {
path: "params", path: "params",
query: { query: {
id: row.id, id: row.id,
assetCode: row.assetCode assetCode: row.assetCode,
} },
}); });
} }
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
reset(); router.push({
open.value = true; path: "AddParams",
title.value = "添加资产信息"; });
// reset();
// open.value = true;
// title.value = "";
} }
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); // reset();
const _id = row.id || ids.value const id = row.id || ids.value;
getInfo(_id).then(response => { const assetCode = row.assetCode;
form.value = response.data; router.push({
open.value = true; path: "AddParams",
title.value = "修改资产信息"; query: {
id,
assetCode,
},
}); });
// getInfo(_id).then((response) => {
// form.value = response.data;
// open.value = true;
// title.value = "";
// });
} }
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["infoRef"].validate(valid => { proxy.$refs["infoRef"].validate((valid) => {
if (valid) { if (valid) {
if (form.value.id != null) { if (form.value.id != null) {
updateInfo(form.value).then(response => { updateInfo(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess("修改成功");
open.value = false; open.value = false;
getList(); getList();
}); });
} else { } else {
addInfo(form.value).then(response => { addInfo(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess("新增成功");
open.value = false; open.value = false;
getList(); getList();
@ -294,19 +416,27 @@ function submitForm() {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const _ids = row.id || ids.value; const _ids = row.id || ids.value;
proxy.$modal.confirm('是否确认删除资产信息编号为"' + _ids + '"的数据项?').then(function () { proxy.$modal
return delInfo(_ids); .confirm('是否确认删除资产信息编号为"' + _ids + '"的数据项?')
}).then(() => { .then(function () {
getList(); return delInfo(_ids);
proxy.$modal.msgSuccess("删除成功"); })
}).catch(() => { }); .then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {});
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download('model.asset/info/export', { proxy.download(
...queryParams.value "model.asset/info/export",
}, `info_${new Date().getTime()}.xlsx`) {
...queryParams.value,
},
`info_${new Date().getTime()}.xlsx`
);
} }
getList(); getList();
@ -316,10 +446,10 @@ getDeptTree();
const deptOptions = ref([]); const deptOptions = ref([]);
const deptName = ref(null); const deptName = ref(null);
function getDeptTree() { function getDeptTree() {
deptTreeSelect().then(response => { deptTreeSelect().then((response) => {
deptOptions.value = response.data; deptOptions.value = response.data;
}); });
}; }
/** 通过条件过滤节点 */ /** 通过条件过滤节点 */
const filterNode = (value, data) => { const filterNode = (value, data) => {
if (!value) return true; if (!value) return true;
@ -329,13 +459,13 @@ const filterNode = (value, data) => {
function handleNodeClick(data) { function handleNodeClick(data) {
queryParams.value.orgCode = data.id; queryParams.value.orgCode = data.id;
handleQuery(); handleQuery();
}; }
function selectDept(val) { function selectDept(val) {
form.value.orgCode = val.id; form.value.orgCode = val.id;
} }
/** 根据名称筛选部门树 */ /** 根据名称筛选部门树 */
watch(deptName, val => { watch(deptName, (val) => {
proxy.$refs["deptTreeRef"].filter(val); proxy.$refs["deptTreeRef"].filter(val);
}); });
</script> </script>

194
src/views/model/asset/params.vue

@ -1,44 +1,95 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px"> <el-form
:model="queryParams"
ref="queryRef"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="资产编号" prop="assetCode"> <el-form-item label="资产编号" prop="assetCode">
<el-input v-model="queryParams.assetCode" placeholder="请输入资产编号" disabled = false clearable @keyup.enter="handleQuery" /> <el-input
v-model="queryParams.assetCode"
placeholder="请输入资产编号"
disabled="false"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="设备uuid" prop="deviceUuid"> <el-form-item label="设备uuid" prop="deviceUuid">
<el-input v-model="queryParams.deviceUuid" placeholder="请输入设备uuid" clearable @keyup.enter="handleQuery" /> <el-input
v-model="queryParams.deviceUuid"
placeholder="请输入设备uuid"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="设备参数编码" prop="paramCode"> <el-form-item label="设备参数编码" prop="paramCode">
<el-input v-model="queryParams.paramCode" placeholder="请输入设备参数编码" clearable @keyup.enter="handleQuery" /> <el-input
v-model="queryParams.paramCode"
placeholder="请输入设备参数编码"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="参数模版" prop="paramClassName"> <el-form-item label="参数模版" prop="paramClassName">
<el-input v-model="queryParams.paramClassName" placeholder="请输入参数模版" clearable @keyup.enter="handleQuery" /> <el-input
v-model="queryParams.paramClassName"
placeholder="请输入参数模版"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" /> <el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery"
<el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button> >搜索</el-button
>
<el-button type="info" plain icon="Refresh" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="Plus" @click="handleAdd">新增</el-button> <el-button type="success" icon="Plus" @click="handleAdd"
>新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="Edit" @click="handleUpdate">修改</el-button> <el-button type="success" icon="Edit" @click="handleUpdate"
>修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="Delete" @click="handleDelete">删除</el-button> <el-button type="success" icon="Delete" @click="handleDelete"
>删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" icon="Download" @click="handleExport">导出</el-button> <el-button type="warning" icon="Download" @click="handleExport"
>导出</el-button
>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="paramsList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="paramsList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="资产编码" align="center" prop="assetCode" /> <el-table-column label="资产编码" align="center" prop="assetCode" />
<el-table-column label="设备uuid" align="center" prop="deviceUuid" /> <el-table-column label="设备uuid" align="center" prop="deviceUuid" />
@ -48,28 +99,48 @@
<el-table-column label="分区" align="center" prop="partion" /> <el-table-column label="分区" align="center" prop="partion" />
<el-table-column label="是否有效" align="center" prop="flagEnabled" /> <el-table-column label="是否有效" align="center" prop="flagEnabled" />
<el-table-column label="是否可控" align="center" prop="contrlFlag" /> <el-table-column label="是否可控" align="center" prop="contrlFlag" />
<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 type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> >修改</el-button
>
<el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" <pagination
@pagination="getList" /> v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改资产参数对话框 --> <!-- 添加或修改资产参数对话框 -->
<el-dialog :title="title" v-model="open" width="600px" append-to-body> <el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="paramsRef" :model="form" :rules="rules" label-width="80px"> <el-form ref="paramsRef" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="资产编号" prop="assetCode"> <el-form-item label="资产编号" prop="assetCode">
<el-input v-model="form.assetCode" placeholder="" disabled=false /> <el-input
v-model="form.assetCode"
placeholder=""
disabled="false"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备uuid" prop="deviceUuid"> <el-form-item label="设备uuid" prop="deviceUuid">
<el-input v-model="form.deviceUuid" placeholder="请输入设备uuid" /> <el-input
v-model="form.deviceUuid"
placeholder="请输入设备uuid"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -110,8 +181,14 @@
</template> </template>
<script setup name="AssetParams"> <script setup name="AssetParams">
import { listParams, getParams, delParams, addParams, updateParams } from "@/api/model/asset/params"; import {
import { useRouter } from 'vue-router' listParams,
getParams,
delParams,
addParams,
updateParams,
} from "@/api/model/asset/params";
import { useRouter } from "vue-router";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const router = useRouter(); const router = useRouter();
const paramsList = ref([]); const paramsList = ref([]);
@ -125,20 +202,20 @@ const total = ref(0);
const title = ref(""); const title = ref("");
const assetCode = router.currentRoute.value.query.assetCode; const assetCode = router.currentRoute.value.query.assetCode;
const contrlFlag = ref([ const contrlFlag = ref([
{label: '可控', value: true, elTagType: 'default', elTagClass: null}, { label: "可控", value: true, elTagType: "default", elTagClass: null },
{label: '不可控', value: false, elTagType: 'default', elTagClass: null} { label: "不可控", value: false, elTagType: "default", elTagClass: null },
]); ]);
const enabled = ref([ const enabled = ref([
{label: '有效', value: true, elTagType: 'default', elTagClass: null}, { label: "有效", value: true, elTagType: "default", elTagClass: null },
{label: '无效', value: false, elTagType: 'default', elTagClass: null} { label: "无效", value: false, elTagType: "default", elTagClass: null },
]); ]);
const contrlFlagTable = ref([ const contrlFlagTable = ref([
{label: '可控', value: 'true', elTagType: 'default', elTagClass: null}, { label: "可控", value: "true", elTagType: "default", elTagClass: null },
{label: '不可控', value: 'false', elTagType: 'default', elTagClass: null} { label: "不可控", value: "false", elTagType: "default", elTagClass: null },
]); ]);
const enabledTable = ref([ const enabledTable = ref([
{label: '有效', value: 'true', elTagType: 'default', elTagClass: null}, { label: "有效", value: "true", elTagType: "default", elTagClass: null },
{label: '无效', value: 'false', elTagType: 'default', elTagClass: null} { label: "无效", value: "false", elTagType: "default", elTagClass: null },
]); ]);
const data = reactive({ const data = reactive({
@ -153,10 +230,9 @@ const data = reactive({
paramClassName: null, paramClassName: null,
name: null, name: null,
flagEnabled: null, flagEnabled: null,
contrlFlag: null contrlFlag: null,
}, },
rules: { rules: {},
}
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
@ -165,7 +241,7 @@ const { queryParams, form, rules } = toRefs(data);
function getList() { function getList() {
queryParams.value.assetCode = assetCode; queryParams.value.assetCode = assetCode;
loading.value = true; loading.value = true;
listParams(queryParams.value).then(response => { listParams(queryParams.value).then((response) => {
paramsList.value = response.rows; paramsList.value = response.rows;
total.value = response.total; total.value = response.total;
loading.value = false; loading.value = false;
@ -198,7 +274,7 @@ function reset() {
paramClassName: null, paramClassName: null,
name: null, name: null,
flagEnabled: null, flagEnabled: null,
contrlFlag: null contrlFlag: null,
}; };
proxy.resetForm("paramsRef"); proxy.resetForm("paramsRef");
} }
@ -217,15 +293,21 @@ function resetQuery() {
// //
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id); ids.value = selection.map((item) => item.id);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
// router.push({
// path: "AddParams",
// query: {
// assetCode,
// },
// });
reset(); reset();
form.value.assetCode = assetCode form.value.assetCode = assetCode;
open.value = true; open.value = true;
title.value = "添加资产参数"; title.value = "添加资产参数";
} }
@ -233,8 +315,8 @@ function handleAdd() {
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); reset();
const _id = row.id || ids.value const _id = row.id || ids.value;
getParams(_id).then(response => { getParams(_id).then((response) => {
form.value = response.data; form.value = response.data;
open.value = true; open.value = true;
title.value = "修改资产参数"; title.value = "修改资产参数";
@ -243,16 +325,16 @@ function handleUpdate(row) {
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["paramsRef"].validate(valid => { proxy.$refs["paramsRef"].validate((valid) => {
if (valid) { if (valid) {
if (form.value.id != null) { if (form.value.id != null) {
updateParams(form.value).then(response => { updateParams(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess("修改成功");
open.value = false; open.value = false;
getList(); getList();
}); });
} else { } else {
addParams(form.value).then(response => { addParams(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess("新增成功");
open.value = false; open.value = false;
getList(); getList();
@ -265,19 +347,27 @@ function submitForm() {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const _ids = row.id || ids.value; const _ids = row.id || ids.value;
proxy.$modal.confirm('是否确认删除资产参数编号为"' + _ids + '"的数据项?').then(function () { proxy.$modal
return delParams(_ids); .confirm('是否确认删除资产参数编号为"' + _ids + '"的数据项?')
}).then(() => { .then(function () {
getList(); return delParams(_ids);
proxy.$modal.msgSuccess("删除成功"); })
}).catch(() => { }); .then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {});
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download('asset/params/export', { proxy.download(
...queryParams.value "asset/params/export",
}, `params_${new Date().getTime()}.xlsx`) {
...queryParams.value,
},
`params_${new Date().getTime()}.xlsx`
);
} }
getList(); getList();

654
src/views/model/heatapiconf/index.vue

@ -3,38 +3,35 @@
<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="pushingCounterpart" label-width="auto">
<el-select v-model="queryParams.excludeDevices" placeholder="请选择排除设备" clearable multiple> <el-select v-model="queryParams.pushingCounterpart" placeholder="请选择推送方" clearable>
<el-option <el-option
v-for="dict in listDeviceAll" v-for="dict in pushing_counterpart"
:key="dict.uuid" :key="dict.value"
:label="dict.deviceName" :label="dict.label"
:value="dict.uuid" :value="dict.value"
/> />
</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
</el-form-item> @keyup.enter="handleQuery"/>
</el-col>
<el-col :span="4">
<el-form-item label="发送地址" prop="sendIp" label-width="auto">
<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 +59,13 @@
</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="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="pushingCounterpart"
<el-table-column label="排除设备" align="center" prop="excludeDevices" show-overflow-tooltip="true" > :formatter="formatterPushingCounterpart"/>
<template #default="scope"> <el-table-column label="标准值" align="center" prop="standard"/>
{{getDevicesNames(scope.row.excludeDevices)}}
</template>
</el-table-column>
<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 +77,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 +93,94 @@
</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"
destroy-on-close>
<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="twoWaterBackTmpt" label="二网回温调整值">
<template #header>
<div @click="twoWaterBackTmptEditHandler">
{{"二网回温调整值"}}<el-icon style="margin-left: 5px;"><EditPen /></el-icon>
</div>
</template>
</el-table-column>
<el-table-column prop="oneWaterTmpt" label="一网供回温调整值">
<template #header>
<div @click="oneWaterTmptEditHandler">
{{"一网供回温调整值"}}<el-icon style="margin-left: 5px;"><EditPen /></el-icon>
</div>
</template>
</el-table-column>
<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 +188,123 @@
</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" destroy-on-close>
<el-form ref="strategyConfEditFormRef" :model="strategyConfEditForm" :rules="strategyConfEditRules"
label-width="150px">
<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="twoWaterBackTmpt">
<el-input type="number" v-model="strategyConfEditForm.twoWaterBackTmpt" placeholder="请输入二网回温调整值"
:disabled="strategyConfEditForm.strategy !== '1'"/>
</el-form-item>
<el-form-item label="一网供回温调整值:" prop="oneWaterTmpt">
<el-input type="number" v-model="strategyConfEditForm.oneWaterTmpt" 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" destroy-on-close>
<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>
<el-dialog title="批量修改二网回温调整值" v-model="openEditTwoWaterBackTmpt" width="500px" append-to-body draggable
:close-on-click-modal="false" destroy-on-close>
<el-form ref="editTwoWaterBackTmptFromRef" :model="editTwoWaterBackTmptFrom" :rules="editTwoWaterBackTmptRules"
label-width="150px">
<el-form-item label="二网回温调整值:" prop="twoWaterBackTmpt">
<el-input type="number" v-model="editTwoWaterBackTmptFrom.twoWaterBackTmpt" placeholder="请输入二网回温调整值"/>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitEditTwoWaterBackTmptFrom"> </el-button>
<el-button @click="cancelEditTwoWaterBackTmptFrom"> </el-button>
</div>
</template>
</el-dialog>
<el-dialog title="批量修改一网供回温调整值" v-model="openOneWaterTmptFrom" width="500px" append-to-body draggable
:close-on-click-modal="false" destroy-on-close>
<el-form ref="editOneWaterTmptFromRef" :model="editOneWaterTmptFrom" :rules="editOneWaterTmptRules"
label-width="150px">
<el-form-item label="一网供回温调整值:" prop="oneWaterTmpt">
<el-input type="number" v-model="editOneWaterTmptFrom.oneWaterTmpt" placeholder="请输入一网供回温调整值"/>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitEditOneWaterTmptFrom"> </el-button>
<el-button @click="cancelEditOneWaterTmptFrom"> </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 +336,70 @@ const data = reactive({
pageSize: 10, pageSize: 10,
orgCode: null, orgCode: null,
standard: null, standard: null,
excludeDevices:[], excludeDevices: [],
}, },
rules: { rules: {
orgCode: [{required: true, message: "请选择热源", trigger: "change"}],
pushingCounterpart: [{required: true, message: "请选择推送方", trigger: "change"}],
standard: [{required: true, message: "请选择标准值", trigger: "blur"}],
dateRange: [{required: true, message: "请选择日期范围", trigger: "change"}],
pushingInterval: [{required: true, message: "请输入时间间隔", trigger: "blur"}],
} }
}); });
const { queryParams, form, rules } = toRefs(data); const {queryParams, form, rules} = toRefs(data);
const deviceList = ref([]);
const deviceStrategyConfList = ref([]);
const openStrategyConfEditForm = ref(false);
const strategyConfEditForm = ref({});
const strategyConfEditRules = ref({
strategy: [{
required: true,
message: '请选择策略',
trigger: 'change'
}],
twoWaterBackTmpt: [{
required: true,
message: '请输入二网回温调整值',
trigger: 'blur'
}],
oneWaterTmpt: [{
required: true,
message: '请输入一网供回温调整值',
trigger: 'blur'
}
]
});
const openStrategyConfAddForm = ref(false);
const strategyConfSaveForm = ref({
deviceList: []
});
const strategyConfSaveRules = ref({
deviceList: [{
required: true,
message: '请选择设备',
trigger: 'change'
}]
});
const openEditTwoWaterBackTmpt = ref(false);
const editTwoWaterBackTmptFrom = ref({});
const editTwoWaterBackTmptRules = ref({
twoWaterBackTmpt: [{
required: true,
message: '请输入二网回温调整值',
trigger: 'blur'
}],
});
const openOneWaterTmptFrom = ref(false);
const editOneWaterTmptFrom = ref({});
const editOneWaterTmptRules = ref({
oneWaterTmpt: [{
required: true,
message: '请输入一网供回温调整值',
trigger: 'blur'
}],
});
/** 查询供热办推送接口配置列表 */ /** 查询供热办推送接口配置列表 */
function getList() { function getList() {
@ -275,6 +467,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 +476,12 @@ 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 != ''){
editable.value = true;
}else{
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 +499,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;
} // formorgName } // formorgName
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 +523,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 +557,8 @@ function handleDelete(row) {
}).then(() => { }).then(() => {
getList(); getList();
proxy.$modal.msgSuccess("删除成功"); proxy.$modal.msgSuccess("删除成功");
}).catch(() => { }); }).catch(() => {
});
} }
function getDeptTreeSelectNew() { function getDeptTreeSelectNew() {
@ -407,7 +603,7 @@ function handleNodeClick(data) {
queryParams.value.orgCode = data.id; queryParams.value.orgCode = data.id;
form.value.orgCode = data.id; form.value.orgCode = data.id;
form.value.orgName = data.label; form.value.orgName = data.label;
disabled.value = data.isLeaf // disabled.value = data.isLeaf
treeSelected.value = data.id; treeSelected.value = data.id;
handleQuery(); handleQuery();
} }
@ -450,10 +646,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 +662,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 +675,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 +687,276 @@ 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(() => {
console.log("确定");
let param = {
id: row.id,
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));
let deviceArr = [];
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) {
deviceArr.push(device);
}
})
deviceList.value = deviceArr;
}
strategyConfSaveForm.value.deviceList = [];
openStrategyConfAddForm.value = true;
nextTick(() => {
if (proxy.$refs["strategyConfSaveFormRef"]) {
proxy.$refs["strategyConfSaveFormRef"].clearValidate();
}
})
}
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();
}
}) })
.then(() => { }
console.log("确定");
let param = { function cancelStrategyConfAddForm() {
id:row.id, openStrategyConfAddForm.value = false;
computeSwitchTotal:row.computeSwitchTotal }
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 '';
}
}
function twoWaterBackTmptEditHandler() {
editTwoWaterBackTmptFrom.value = {};
openEditTwoWaterBackTmpt.value = true;
}
function submitEditTwoWaterBackTmptFrom() {
proxy.$refs["editTwoWaterBackTmptFromRef"].validate(valid => {
if (valid) {
if (deviceStrategyConfList.value && deviceStrategyConfList.value.length > 0) {
deviceStrategyConfList.value.forEach(item => {
item.twoWaterBackTmpt = editTwoWaterBackTmptFrom.value.twoWaterBackTmpt;
})
}
cancelEditTwoWaterBackTmptFrom();
} }
updateHeatapiconf(param);
}) })
.catch((action) => { }
console.log("取消");
row.computeSwitchTotal = !row.computeSwitchTotal; function cancelEditTwoWaterBackTmptFrom() {
openEditTwoWaterBackTmpt.value = false;
}
function oneWaterTmptEditHandler() {
editOneWaterTmptFrom.value = {};
openOneWaterTmptFrom.value = true;
}
function submitEditOneWaterTmptFrom() {
proxy.$refs["editOneWaterTmptFromRef"].validate(valid => {
if (valid) {
if (deviceStrategyConfList.value && deviceStrategyConfList.value.length > 0) {
deviceStrategyConfList.value.forEach(item => {
item.oneWaterTmpt = editOneWaterTmptFrom.value.oneWaterTmpt;
})
}
cancelEditOneWaterTmptFrom();
}
}) })
}
function cancelEditOneWaterTmptFrom() {
openOneWaterTmptFrom.value = false;
} }
getDevicesAll(); getDevicesAll();
getDeptTree(); getDeptTree();
getDeptTreeSelectNew(); getDeptTreeSelectNew();
getList(); getList();
</script> </script>

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

@ -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();

Loading…
Cancel
Save