Browse Source

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

develop^2
bobol 8 months ago
parent
commit
0ab78fd0c3
  1. 2
      .env.development
  2. 57
      src/api/model/asset/params.js
  3. 130
      src/store/modules/user.js
  4. 520
      src/views/model/asset/addParams.vue
  5. 282
      src/views/model/asset/index.vue
  6. 20
      src/views/model/asset/params.vue

2
.env.development

@ -5,5 +5,5 @@ VITE_APP_TITLE = 联美运营系统
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'

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

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

130
src/store/modules/user.js

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

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

@ -1,61 +1,139 @@
<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 :inline="true" :model="addForm" class="demo-form-inline">
<el-form-item label="资产编号">
<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="addForm.num"
placeholder="资产编号"
v-model="formData.paramsForm.assetCode"
placeholder="编码"
clearable
readonly
/>
</el-form-item>
<el-form-item label="资产名称">
<el-input v-model="addForm.name" placeholder="资产名称" clearable />
</el-form-item>
<el-form-item label="组成设备">
<el-form-item label="是否可用" prop="flagEnabled">
<el-select
v-model="addForm.device"
multiple
filterable
allow-create
default-first-option
:reserve-keyword="false"
placeholder="组成设备"
style="width: 240px"
v-model="formData.paramsForm.flagEnabled"
placeholder="请选择是否可用"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="dict in enabledFlag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="success" @click="selectParams">选择参数</el-button>
<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="tableRef"
ref="paramsTableRef"
max-height="400"
:row-config="{ isHover: true }"
:loading="loading"
:data="tableListData"
:data="paramsList"
>
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column field="role" title="参数编码"></vxe-column>
<vxe-column field="paramCode" title="参数编码"></vxe-column>
<vxe-column
field="address"
field="paramName"
title="参数名称"
:filters="addressOptions"
:filter-method="filterAddressMethod"
:filter-recover-method="filterAddressRecoverMethod"
:filter-method="filterParamName"
:filter-recover-method="filterParamNameRecover"
>
<template #filter="{ $panel, column }">
<vxe-input
@ -70,14 +148,23 @@
></vxe-input>
</template>
</vxe-column>
<vxe-column field="youxiao" title="是否有效">
<vxe-column field="flagEnabled" title="是否有效">
<template #default="{ row }">
<vxe-checkbox v-model="row.youxiao"></vxe-checkbox>
<vxe-checkbox v-model="row.flagEnabled"></vxe-checkbox>
</template>
</vxe-column>
<vxe-column field="kekong" title="是否可控">
<vxe-column field="contrlFlag" title="是否可控">
<template #default="{ row }">
<vxe-checkbox v-model="row.kekong"></vxe-checkbox>
<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>
@ -87,27 +174,27 @@
class="addDialog"
v-model="dialogTableVisible"
title="选择参数"
width="900"
width="1200"
>
<vxe-table
class="tableDialog"
border
ref="tableRef"
ref="addTableRef"
max-height="400"
:row-config="{ isHover: true }"
:loading="loading"
:data="tableData"
:data="paramsData"
>
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column field="id" title="设备编码" sortable></vxe-column>
<vxe-column field="name" title="设备名称"></vxe-column>
<vxe-column field="role" title="参数编码"></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="age"
field="paramModelName"
title="参数模版名称"
:filters="ageOptions"
:filter-method="filterAgeMethod"
:filter-recover-method="filterAgeRecoverMethod"
:filter-method="filterParamModel"
:filter-recover-method="filterParamModelRecover"
>
<template #filter="{ $panel, column }">
<vxe-input
@ -123,11 +210,11 @@
</template>
</vxe-column>
<vxe-column
field="address"
field="paramName"
title="参数名称"
:filters="addressOptions"
:filter-method="filterAddressMethod"
:filter-recover-method="filterAddressRecoverMethod"
:filter-method="filterParamNameSel"
:filter-recover-method="filterParamNameRecoverSel"
>
<template #filter="{ $panel, column }">
<vxe-input
@ -143,7 +230,7 @@
</template>
</vxe-column>
<vxe-column
field="sex"
field="partion"
title="分区"
:filter-multiple="false"
:filters="sexOptions"
@ -152,9 +239,7 @@
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogTableVisible = false">取消</el-button>
<el-button type="primary" @click="dialogTableVisible = false">
确认
</el-button>
<el-button type="primary" @click="addConfirm"> 确认 </el-button>
</div>
</template>
</el-dialog>
@ -162,114 +247,271 @@
</template>
<script setup>
import { ref, reactive, onMounted } from "vue";
import { useRoute } from "vue-router";
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 addForm = reactive({
num: route.query.assetCode,
name: "",
device: [],
});
const options = [
{
value: "HTML",
label: "HTML",
},
{
value: "CSS",
label: "CSS",
},
{
value: "JavaScript",
label: "JavaScript",
},
];
const tableRef = ref();
const loading = ref(false);
const tableData = ref([
{
id: 10001,
name: "Test1",
role: "Develop",
sex: "Man",
age: 28,
address: "test",
},
{
id: 10002,
name: "Test2",
role: "admin",
sex: "Man",
age: 29,
address: "asd",
},
{
id: 10003,
name: "Test3",
role: "useer",
sex: "Man",
age: 22,
address: "qsx",
},
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 tableListData = ref([
{
id: 10001,
name: "Test1",
role: "Develop",
sex: "Man",
age: 28,
address: "test",
youxiao: true,
kekong: false,
const formData = reactive({
paramsForm: {
assetCode: "",
flagEnabled: null,
assetName: "",
assetType: "",
orgCode: null,
orgName: "",
assetParamsDtos: [
{
paramCode: "",
flagEnabled: false,
contrlFlag: false,
},
],
},
{
id: 10002,
name: "Test2",
role: "admin",
sex: "Man",
age: 29,
address: "asd",
youxiao: false,
kekong: true,
},
{
id: 10003,
name: "Test3",
role: "useer",
sex: "Man",
age: 22,
address: "qsx",
youxiao: false,
kekong: false,
},
]);
});
const paramsTableRef = ref();
const addTableRef = ref();
const loading = ref(false);
const sexOptions = ref([
{ label: "高", value: "Man" },
{ label: "中", value: "Women" },
{ 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 filterAgeMethod = ({ option, row }) => {
return row.age === Number(option.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 filterAgeRecoverMethod = ({ option }) => {
//
const filterParamNameRecover = ({ option }) => {
//
option.data = "";
};
const filterAddressMethod = ({ option, row }) => {
return row.address === option.data;
const filterParamNameSel = ({ option, row }) => {
//
return row.paramName === option.data;
};
const filterAddressRecoverMethod = ({ option }) => {
//
const filterParamNameRecoverSel = ({ option }) => {
//
option.data = "";
};
onMounted(() => {});
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() {
//
dialogTableVisible.value = true;
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 {

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

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

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

@ -300,16 +300,16 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */
function handleAdd() {
router.push({
path: "AddParams",
query: {
assetCode,
},
});
// reset();
// form.value.assetCode = assetCode
// open.value = true;
// title.value = "";
// router.push({
// path: "AddParams",
// query: {
// assetCode,
// },
// });
reset();
form.value.assetCode = assetCode;
open.value = true;
title.value = "添加资产参数";
}
/** 修改按钮操作 */

Loading…
Cancel
Save