物联设备维护
This commit is contained in:
parent
adc9ffd7e8
commit
ab5fcf009f
|
|
@ -17,7 +17,7 @@ export const columns: BasicColumn[] = [
|
|||
{
|
||||
title: '设备标识',
|
||||
align: "center",
|
||||
dataIndex: 'deviceName'
|
||||
dataIndex: 'mac'
|
||||
},
|
||||
{
|
||||
title: '设备型号',
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ export const columns: BasicColumn[] = [
|
|||
{
|
||||
title: '设备标识',
|
||||
align: "center",
|
||||
dataIndex: 'deviceName'
|
||||
dataIndex: 'mac'
|
||||
},
|
||||
{
|
||||
title: '设备型号',
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
import {defHttp} from '/@/utils/http/axios';
|
||||
import { useMessage } from "/@/hooks/web/useMessage";
|
||||
|
||||
const { createConfirm } = useMessage();
|
||||
|
||||
enum Api {
|
||||
list = '/iot/weihu/deviceMaintain/remarksList',
|
||||
save='/iot/weihu/deviceMaintain/add',
|
||||
edit='/iot/weihu/deviceMaintain/edit',
|
||||
deleteOne = '/iot/weihu/deviceMaintain/delete',
|
||||
deleteBatch = '/iot/weihu/deviceMaintain/deleteBatch',
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表接口
|
||||
* @param params
|
||||
*/
|
||||
export const list = (params) =>
|
||||
defHttp.get({url: Api.list, params});
|
||||
|
||||
/**
|
||||
* 删除单个
|
||||
*/
|
||||
export const deleteOne = (params,handleSuccess) => {
|
||||
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
|
||||
handleSuccess();
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 批量删除
|
||||
* @param params
|
||||
*/
|
||||
export const batchDelete = (params, handleSuccess) => {
|
||||
createConfirm({
|
||||
iconType: 'warning',
|
||||
title: '确认删除',
|
||||
content: '是否删除选中数据',
|
||||
okText: '确认',
|
||||
cancelText: '取消',
|
||||
onOk: () => {
|
||||
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
|
||||
handleSuccess();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 保存或者更新
|
||||
* @param params
|
||||
*/
|
||||
export const saveOrUpdate = (params, isUpdate) => {
|
||||
let url = isUpdate ? Api.edit : Api.save;
|
||||
return defHttp.post({url: url, params}, { isTransformResponse: false });
|
||||
}
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
import {BasicColumn} from '/@/components/Table';
|
||||
import {FormSchema} from '/@/components/Table';
|
||||
import { rules} from '/@/utils/helper/validator';
|
||||
import { render } from '/@/utils/common/renderUtils';
|
||||
import { getWeekMonthQuarterYear } from '/@/utils';
|
||||
//列表数据
|
||||
export const columns: BasicColumn[] = [
|
||||
{
|
||||
title: '设备类型',
|
||||
align: "center",
|
||||
dataIndex: 'type'
|
||||
},
|
||||
{
|
||||
title: '设备编码',
|
||||
align: "center",
|
||||
dataIndex: 'deviceId'
|
||||
},
|
||||
{
|
||||
title: 'SN',
|
||||
align: "center",
|
||||
dataIndex: 'sn'
|
||||
},
|
||||
{
|
||||
title: '发往机构名',
|
||||
align: "center",
|
||||
dataIndex: 'reserveDepartName'
|
||||
},
|
||||
{
|
||||
title: '更新时间',
|
||||
align:"center",
|
||||
dataIndex: 'updateDate',
|
||||
width: 160
|
||||
},
|
||||
{
|
||||
title: '备注',
|
||||
align:"center",
|
||||
dataIndex: 'remark'
|
||||
},
|
||||
];
|
||||
//查询数据
|
||||
export const searchFormSchema: FormSchema[] = [
|
||||
{
|
||||
label: '删除',
|
||||
field: 'delFlag',
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
options: [
|
||||
{
|
||||
label: '正常',
|
||||
value: '0',
|
||||
key: '0',
|
||||
},
|
||||
{
|
||||
label: '删除',
|
||||
value: '1',
|
||||
key: '1',
|
||||
},
|
||||
],
|
||||
},
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
];
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
<template>
|
||||
<a-drawer :title="title" :width="'50vw'" v-model:visible="visible" :closable="true"
|
||||
:footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
|
||||
<HeatanalysisRemarksForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></HeatanalysisRemarksForm>
|
||||
<template #footer>
|
||||
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
|
||||
</template>
|
||||
</a-drawer>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, nextTick, defineExpose } from 'vue';
|
||||
import HeatanalysisRemarksForm from './RemarksForm.vue'
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
|
||||
const title = ref<string>('');
|
||||
const width = ref<number>(1200);
|
||||
const visible = ref<boolean>(false);
|
||||
const disableSubmit = ref<boolean>(false);
|
||||
const registerForm = ref();
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*/
|
||||
function add(parentData) {
|
||||
title.value = '新增';
|
||||
visible.value = true;
|
||||
nextTick(() => {
|
||||
registerForm.value.add(parentData);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
* @param record
|
||||
*/
|
||||
function edit(record) {
|
||||
title.value = disableSubmit.value ? '详情' : '编辑';
|
||||
visible.value = true;
|
||||
nextTick(() => {
|
||||
registerForm.value.edit(record);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 确定按钮点击事件
|
||||
*/
|
||||
function handleOk() {
|
||||
registerForm.value.submitForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* form保存回调事件
|
||||
*/
|
||||
function submitCallback() {
|
||||
handleCancel();
|
||||
emit('success');
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消按钮回调事件
|
||||
*/
|
||||
function handleCancel() {
|
||||
visible.value = false;
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
add,
|
||||
edit,
|
||||
disableSubmit,
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less">
|
||||
/**隐藏样式-modal确定按钮 */
|
||||
.jee-hidden {
|
||||
display: none !important;
|
||||
}
|
||||
</style>
|
||||
<style lang="less" scoped></style>
|
||||
|
|
@ -36,7 +36,7 @@ function add() {
|
|||
* @param record
|
||||
*/
|
||||
function edit(record) {
|
||||
title.value = '运维列表';
|
||||
title.value = '物联设备维护日志列表';
|
||||
visible.value = true;
|
||||
nextTick(() => {
|
||||
remarksList.value.init(record);
|
||||
|
|
|
|||
|
|
@ -1,181 +0,0 @@
|
|||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-row >
|
||||
<a-col :span="24">
|
||||
<a-form-item label="设备类型">
|
||||
<a-input v-model:value="formData.type" :disabled="true"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="设备编码">
|
||||
<a-input v-model:value="formData.deviceId" :disabled="true"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="SN">
|
||||
<a-input v-model:value="formData.sn" :disabled="true"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="发往机构">
|
||||
<a-input v-model:value="formData.reserveDepartName" :disabled="true"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="备注" v-bind="validateInfos.remark">
|
||||
<a-textarea v-model:value="formData.remark" placeholder="请输入备注" :rows="4" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</template>
|
||||
</JFormContainer>
|
||||
</a-spin>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { getValueType } from '/@/utils';
|
||||
import { saveOrUpdate } from './Reamrks.api';
|
||||
import { Form } from 'ant-design-vue';
|
||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||
|
||||
const props = defineProps({
|
||||
formDisabled: { type: Boolean, default: false },
|
||||
formData: { type: Object, default: ()=>{} },
|
||||
formBpm: { type: Boolean, default: true }
|
||||
});
|
||||
const formRef = ref();
|
||||
const useForm = Form.useForm;
|
||||
const emit = defineEmits(['register', 'ok']);
|
||||
const formData = reactive<Record<string, any>>({
|
||||
id: undefined,
|
||||
deviceId: undefined,
|
||||
type: undefined,
|
||||
sn: undefined,
|
||||
reserveDepartName: undefined,
|
||||
remark: undefined,
|
||||
});
|
||||
const { createMessage } = useMessage();
|
||||
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
|
||||
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
|
||||
const confirmLoading = ref<boolean>(false);
|
||||
//表单验证
|
||||
const validatorRules = {
|
||||
remarks: [{ required: true, message: '请输入备注!'},],
|
||||
};
|
||||
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
|
||||
|
||||
// 表单禁用
|
||||
const disabled = computed(()=>{
|
||||
if(props.formBpm === true){
|
||||
if(props.formData.disabled === false){
|
||||
return false;
|
||||
}else{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return props.formDisabled;
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*/
|
||||
function add(parentData) {
|
||||
let record = {};
|
||||
record["deviceId"] = parentData["deviceId"];
|
||||
record["type"] = parentData["type"];
|
||||
record["sn"] = parentData["sn"];
|
||||
record["reserveDepartName"] = parentData["reserveDepartName"];
|
||||
edit(record);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
function edit(record) {
|
||||
nextTick(() => {
|
||||
resetFields();
|
||||
//赋值
|
||||
const tmpData = {};
|
||||
Object.keys(formData).forEach((key) => {
|
||||
if(record.hasOwnProperty(key)){
|
||||
tmpData[key] = record[key]
|
||||
}
|
||||
})
|
||||
//赋值
|
||||
Object.assign(formData, tmpData);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交数据
|
||||
*/
|
||||
async function submitForm() {
|
||||
try {
|
||||
// 触发表单验证
|
||||
await validate();
|
||||
} catch ({ errorFields }) {
|
||||
if (errorFields) {
|
||||
const firstField = errorFields[0];
|
||||
if (firstField) {
|
||||
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
|
||||
}
|
||||
}
|
||||
return Promise.reject(errorFields);
|
||||
}
|
||||
confirmLoading.value = true;
|
||||
const isUpdate = ref<boolean>(false);
|
||||
//时间格式化
|
||||
let model = formData;
|
||||
if (model.id) {
|
||||
isUpdate.value = true;
|
||||
}
|
||||
//循环数据
|
||||
for (let data in model) {
|
||||
//如果该数据是数组并且是字符串类型
|
||||
if (model[data] instanceof Array) {
|
||||
let valueType = getValueType(formRef.value.getProps, data);
|
||||
//如果是字符串类型的需要变成以逗号分割的字符串
|
||||
if (valueType === 'string') {
|
||||
model[data] = model[data].join(',');
|
||||
}
|
||||
}
|
||||
}
|
||||
await saveOrUpdate(model, isUpdate.value)
|
||||
.then((res) => {
|
||||
if (res.success) {
|
||||
createMessage.success(res.message);
|
||||
emit('ok');
|
||||
} else {
|
||||
createMessage.warning(res.message);
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
confirmLoading.value = false;
|
||||
});
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
add,
|
||||
edit,
|
||||
submitForm,
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
</style>
|
||||
|
|
@ -1,48 +1,9 @@
|
|||
<template>
|
||||
<div>
|
||||
<JFormContainer :disabled="disabled">
|
||||
<template #detail>
|
||||
</template>
|
||||
</JFormContainer>
|
||||
<!--查询区域-->
|
||||
<div class="jeecg-basic-table-form-container">
|
||||
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||
<a-row :gutter="24">
|
||||
<a-col :lg="6">
|
||||
<a-form-item label="删除状态">
|
||||
<a-select ref="select" placeholder="请选择状态" v-model:value="queryParam.delFlag">
|
||||
<a-select-option value="0">正常</a-select-option>
|
||||
<a-select-option value="1">删除</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="6">
|
||||
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
||||
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
|
||||
<a-button preIcon="ant-design:sync-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
|
||||
</span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</div>
|
||||
<!--引用表格-->
|
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection" size="small">
|
||||
<BasicTable @register="registerTable">
|
||||
<!--插槽:table标题-->
|
||||
<template #tableTitle>
|
||||
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
|
||||
<a-dropdown v-if="selectedRowKeys.length > 0">
|
||||
<template #overlay>
|
||||
<a-menu>
|
||||
<a-menu-item key="1" @click="batchHandleDelete">
|
||||
<Icon icon="ant-design:delete-outlined"></Icon>
|
||||
删除
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</template>
|
||||
<a-button >批量操作
|
||||
<Icon icon="mdi:chevron-down"></Icon>
|
||||
</a-button>
|
||||
</a-dropdown>
|
||||
</template>
|
||||
<!--操作栏-->
|
||||
<template #action="{ record }">
|
||||
|
|
@ -52,8 +13,6 @@
|
|||
<template v-slot:bodyCell="{ column, record, index, text }">
|
||||
</template>
|
||||
</BasicTable>
|
||||
<!-- 表单区域 -->
|
||||
<ReamrksFormModal ref="registerModal" @success="handleSuccess"></ReamrksFormModal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -61,33 +20,23 @@
|
|||
import {ref, reactive, computed, unref, defineProps} from 'vue';
|
||||
import {BasicTable, useTable, TableAction} from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import ReamrksFormModal from './ReamrksFormModal.vue';
|
||||
import {columns, searchFormSchema} from './Reamrks.data';
|
||||
import {list, deleteOne, batchDelete} from './Reamrks.api';
|
||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||
import { logColumns } from '../weihu.data';
|
||||
import { remarksList } from '../weihu.api';
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
const props = defineProps({
|
||||
formDisabled: { type: Boolean, default: false },
|
||||
formData: { type: Object, default: () => ({})},
|
||||
formBpm: { type: Boolean, default: true }
|
||||
});
|
||||
|
||||
const queryParam = reactive<any>({});
|
||||
const parentData = ref();
|
||||
const checkedKeys = ref<Array<string | number>>([]);
|
||||
const deviceName = ref<any>('');
|
||||
const userStore = useUserStore();
|
||||
const registerModal = ref();
|
||||
//注册table数据
|
||||
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
|
||||
tableProps:{
|
||||
title: '设备维护日志',
|
||||
api: list,
|
||||
defSort: {
|
||||
column: 'id',
|
||||
order: 'asc',
|
||||
},
|
||||
columns,
|
||||
api: remarksList,
|
||||
columns: logColumns,
|
||||
canResize:false,
|
||||
showIndexColumn: true,
|
||||
showActionColumn: false,
|
||||
actionColumn: {
|
||||
width: 130,
|
||||
fixed:'right'
|
||||
|
|
@ -108,39 +57,6 @@ import {ref, reactive, computed, unref, defineProps} from 'vue';
|
|||
sm: { span: 16 },
|
||||
});
|
||||
|
||||
/**
|
||||
* 新增事件
|
||||
*/
|
||||
function handleAdd() {
|
||||
registerModal.value.disableSubmit = false;
|
||||
registerModal.value.add(parentData.value);
|
||||
}
|
||||
/**
|
||||
* 编辑事件
|
||||
*/
|
||||
function handleEdit(record: Recordable) {
|
||||
registerModal.value.disableSubmit = false;
|
||||
registerModal.value.edit(record);
|
||||
}
|
||||
/**
|
||||
* 详情
|
||||
*/
|
||||
function handleDetail(record: Recordable) {
|
||||
registerModal.value.disableSubmit = true;
|
||||
registerModal.value.edit(record);
|
||||
}
|
||||
/**
|
||||
* 删除事件
|
||||
*/
|
||||
async function handleDelete(record) {
|
||||
await deleteOne({id: record.id}, handleSuccess);
|
||||
}
|
||||
/**
|
||||
* 批量删除事件
|
||||
*/
|
||||
async function batchHandleDelete() {
|
||||
await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
|
||||
}
|
||||
/**
|
||||
* 成功回调
|
||||
*/
|
||||
|
|
@ -151,67 +67,22 @@ import {ref, reactive, computed, unref, defineProps} from 'vue';
|
|||
* 操作栏
|
||||
*/
|
||||
function getTableAction(record){
|
||||
// return [
|
||||
// {
|
||||
// label: '详情',
|
||||
// onClick: handleDetail.bind(null, record),
|
||||
// },
|
||||
// {
|
||||
// label: '编辑',
|
||||
// onClick: handleEdit.bind(null, record),
|
||||
// }, {
|
||||
// label: '删除',
|
||||
// popConfirm: {
|
||||
// title: '是否确认删除',
|
||||
// confirm: handleDelete.bind(null, record),
|
||||
// placement: 'topLeft',
|
||||
// },
|
||||
// }
|
||||
// ]
|
||||
const actions = [];
|
||||
actions.push(
|
||||
{
|
||||
label: '详情',
|
||||
onClick: handleDetail.bind(null, record),
|
||||
}
|
||||
);
|
||||
if(record.delFlag == '0'){
|
||||
// actions.push(
|
||||
// {
|
||||
// label: '编辑',
|
||||
// onClick: handleEdit.bind(null, record),
|
||||
// }
|
||||
// );
|
||||
actions.push(
|
||||
{
|
||||
label: '删除',
|
||||
popConfirm: {
|
||||
title: '是否确认删除',
|
||||
confirm: handleDelete.bind(null, record),
|
||||
placement: 'topLeft',
|
||||
},
|
||||
}
|
||||
);
|
||||
}
|
||||
return actions;
|
||||
return []
|
||||
}
|
||||
|
||||
function init(record){
|
||||
parentData.value = unref(record);
|
||||
queryParam.deviceId = parentData.value.deviceId;
|
||||
queryParam.delFlag = '0';
|
||||
reload();
|
||||
}
|
||||
|
||||
function searchQuery(){
|
||||
queryParam.deviceName = deviceName.value;
|
||||
reload();
|
||||
}
|
||||
|
||||
function searchReset(){
|
||||
queryParam.delFlag = '0';
|
||||
selectedRowKeys.value = [];
|
||||
//刷新数据
|
||||
reload();
|
||||
searchQuery();
|
||||
}
|
||||
|
||||
function init(record){
|
||||
deviceName.value = record.deviceName;
|
||||
searchQuery();
|
||||
}
|
||||
|
||||
// 暴露给父组件的方法
|
||||
|
|
@ -219,7 +90,6 @@ import {ref, reactive, computed, unref, defineProps} from 'vue';
|
|||
init
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
|
|
|
|||
|
|
@ -1,88 +0,0 @@
|
|||
<template>
|
||||
<BasicDrawer v-bind="$attrs" @register="registerDrawer" :title="getTitle" :width="adaptiveWidth" @ok="handleSubmit"
|
||||
:showFooter="showFooter" destroyOnClose>
|
||||
<div class="card-class">
|
||||
<BasicForm @register="registerForm"></BasicForm>
|
||||
</div>
|
||||
</BasicDrawer>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
|
||||
import { BasicForm, useForm } from '/@/components/Form/index';
|
||||
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
|
||||
import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
|
||||
import { formSchema } from '../weihu.data';
|
||||
import { saveSendOrg } from '../weihu.api';
|
||||
import { useMessage } from "@/hooks/web/useMessage";
|
||||
const { createMessage } = useMessage();
|
||||
// 声明Emits
|
||||
const emit = defineEmits(['success', 'register']);
|
||||
const attrs = useAttrs();
|
||||
const isUpdate = ref(true);
|
||||
const rowId = ref('');
|
||||
//表单配置
|
||||
const [registerForm, { setProps, resetFields, validateFields, getFieldsValue, setFieldsValue, validate, updateSchema }] = useForm({
|
||||
labelWidth: 90,
|
||||
schemas: formSchema,
|
||||
showActionButtonGroup: false,
|
||||
});
|
||||
const showFooter = ref(true);
|
||||
const records = ref<any[]>([]);
|
||||
//表单赋值
|
||||
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
|
||||
await resetFields();
|
||||
showFooter.value = data?.showFooter ?? true;
|
||||
setDrawerProps({ confirmLoading: false, showFooter: showFooter.value });
|
||||
isUpdate.value = !!data?.isUpdate;
|
||||
|
||||
if (data.records) {
|
||||
records.value = data.records;
|
||||
let record = data.records[0];
|
||||
console.log(record);
|
||||
await setFieldsValue({
|
||||
...record,
|
||||
});
|
||||
}
|
||||
// 隐藏底部时禁用整个表单
|
||||
setProps({ disabled: !showFooter.value });
|
||||
});
|
||||
//获取标题
|
||||
const getTitle = computed(() => {
|
||||
if (!unref(isUpdate)) {
|
||||
return '新增维护设备';
|
||||
} else {
|
||||
return unref(showFooter) ? '指定派往机构' : '详情';
|
||||
}
|
||||
});
|
||||
const { adaptiveWidth } = useDrawerAdaptiveWidth();
|
||||
|
||||
//提交事件
|
||||
async function handleSubmit() {
|
||||
try {
|
||||
let values = await validate();
|
||||
values.deviceMaintainList = records.value;
|
||||
setDrawerProps({ confirmLoading: true });
|
||||
await saveSendOrg(values);
|
||||
//关闭弹窗
|
||||
closeDrawer();
|
||||
//刷新列表
|
||||
emit('success');
|
||||
} finally {
|
||||
setDrawerProps({ confirmLoading: false });
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.card-class {
|
||||
padding-top: 24px;
|
||||
padding-bottom: 24px;
|
||||
padding-left: 14px;
|
||||
padding-right: 14px;
|
||||
background-color: #fcfdff;
|
||||
border-radius: 10px;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
<template>
|
||||
<div>
|
||||
<!--引用表格-->
|
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection" @selection-change="handleSelectionChange" size="small">
|
||||
<BasicTable @register="registerTable">
|
||||
<!--插槽:table标题-->
|
||||
<template #tableTitle>
|
||||
<a-button v-if="selectedRowKeys.length > 0" preIcon="ant-design:flag-outlined" @click="handleSendOrg" >选择发往机构</a-button>
|
||||
</template>
|
||||
<template #form-depart="{model,field}">
|
||||
<a-select ref="select"
|
||||
|
|
@ -26,7 +25,7 @@
|
|||
<TableAction :actions="getTableAction(record)"/>
|
||||
</template>
|
||||
</BasicTable>
|
||||
<SendOrgDrawer @register="registerDrawer" @success="handleSuccess" />
|
||||
<!-- <SendOrgDrawer @register="registerDrawer" @success="handleSuccess" />-->
|
||||
<ReamrksListModal ref="remarksModal"></ReamrksListModal>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -47,7 +46,7 @@ import {onMounted, reactive, ref} from 'vue';
|
|||
//注册table数据
|
||||
const { prefixCls,tableContext } = useListPage({
|
||||
tableProps:{
|
||||
title: '设备维修',
|
||||
title: '设备维护',
|
||||
api: list,
|
||||
columns,
|
||||
canResize:false,
|
||||
|
|
@ -69,19 +68,19 @@ import {onMounted, reactive, ref} from 'vue';
|
|||
|
||||
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
|
||||
|
||||
function handleSelectionChange(selectedRowSet) {
|
||||
selectedRows.value = selectedRowSet.rows;
|
||||
console.log('当前选中数据:', selectedRows.value);
|
||||
}
|
||||
|
||||
function handleSendOrg(){
|
||||
openDrawer(true, {
|
||||
records : selectedRows.value,
|
||||
isUpdate: true,
|
||||
showFooter: true,
|
||||
tenantSaas: false,
|
||||
});
|
||||
}
|
||||
// function handleSelectionChange(selectedRowSet) {
|
||||
// selectedRows.value = selectedRowSet.rows;
|
||||
// console.log('当前选中数据:', selectedRows.value);
|
||||
// }
|
||||
//
|
||||
// function handleSendOrg(){
|
||||
// openDrawer(true, {
|
||||
// records : selectedRows.value,
|
||||
// isUpdate: true,
|
||||
// showFooter: true,
|
||||
// tenantSaas: false,
|
||||
// });
|
||||
// }
|
||||
|
||||
/**
|
||||
* 成功回调
|
||||
|
|
@ -111,10 +110,6 @@ import {onMounted, reactive, ref} from 'vue';
|
|||
*/
|
||||
function getTableAction(record){
|
||||
return [
|
||||
// {
|
||||
// label: '备注',
|
||||
// onClick: handleDetail.bind(null, record),
|
||||
// },
|
||||
{
|
||||
label: '备注',
|
||||
onClick: handleDetail.bind(null, record),
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ enum Api {
|
|||
saveSendOrg = '/iot/weihu/deviceMaintain/saveSendOrg',
|
||||
departlist = '/iot/weihu/deviceMaintain/departlist',
|
||||
nulist = '/iot/weihu/deviceMaintain/nulist',
|
||||
remarksList = '/iot/weihu/deviceMaintain/remarksList',
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -32,3 +33,9 @@ export const departlist = (params) => defHttp.get({ url: Api.departlist, params
|
|||
* @param params
|
||||
*/
|
||||
export const nulist = (params) => defHttp.get({ url: Api.nulist, params });
|
||||
|
||||
/**
|
||||
* 接口
|
||||
* @param params
|
||||
*/
|
||||
export const remarksList = (params) => defHttp.get({ url: Api.remarksList, params });
|
||||
|
|
|
|||
|
|
@ -4,22 +4,65 @@ import {FormSchema} from '/@/components/Table';
|
|||
//列表数据
|
||||
export const columns: BasicColumn[] = [
|
||||
{
|
||||
title: '设备类型',
|
||||
title: '机构编码',
|
||||
align: "center",
|
||||
dataIndex: 'type'
|
||||
dataIndex: 'orgCode',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '机构名称',
|
||||
align: "center",
|
||||
dataIndex: 'departName'
|
||||
},
|
||||
{
|
||||
title: '区域编码',
|
||||
align: "center",
|
||||
dataIndex: 'nuId',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '区域名称',
|
||||
align: "center",
|
||||
dataIndex: 'nuName'
|
||||
},
|
||||
{
|
||||
title: '区域类型',
|
||||
align: "center",
|
||||
dataIndex: 'areaFlag_dictText',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '设备标识',
|
||||
align: "center",
|
||||
dataIndex: 'deviceName',
|
||||
width: 140,
|
||||
},
|
||||
{
|
||||
title: '设备编码',
|
||||
align: "center",
|
||||
dataIndex: 'deviceId'
|
||||
dataIndex: 'deviceId',
|
||||
width: 140,
|
||||
},
|
||||
{
|
||||
title: 'SN',
|
||||
title: '设备类型',
|
||||
align: "center",
|
||||
dataIndex: 'sn'
|
||||
dataIndex: 'deviceType',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '维修状态',
|
||||
title: '在线状态',
|
||||
align: "center",
|
||||
dataIndex: 'deviceStatus',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '分配状态',
|
||||
align: "center",
|
||||
dataIndex: 'izAllocate',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '设备状态',
|
||||
align: "center",
|
||||
dataIndex: 'maintainStatus',
|
||||
customRender:({record})=>{
|
||||
|
|
@ -27,89 +70,25 @@ export const columns: BasicColumn[] = [
|
|||
return "正常";
|
||||
}
|
||||
if(record.maintainStatus==1){
|
||||
return "报修";
|
||||
return "释放";
|
||||
}
|
||||
if(record.maintainStatus==2){
|
||||
return "报废";
|
||||
return "损坏";
|
||||
}
|
||||
},
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '绑定区域',
|
||||
title: '时间戳',
|
||||
align: "center",
|
||||
dataIndex: 'nuId',
|
||||
},
|
||||
{
|
||||
title: '绑定机构',
|
||||
align: "center",
|
||||
dataIndex: 'orgCode',
|
||||
},
|
||||
{
|
||||
title: '绑定机构名',
|
||||
align: "center",
|
||||
dataIndex: 'departName',
|
||||
},
|
||||
{
|
||||
title: '发往机构名',
|
||||
align: "center",
|
||||
dataIndex: 'reserveDepartName'
|
||||
},
|
||||
{
|
||||
title: '更新时间',
|
||||
align: "center",
|
||||
dataIndex: 'updateDate'
|
||||
dataIndex: 'updateDate',
|
||||
width: 160,
|
||||
},
|
||||
];
|
||||
|
||||
export const searchFormSchema: FormSchema[] = [
|
||||
{
|
||||
label: '设备类型',
|
||||
field: 'type',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: {
|
||||
placeholder: '请选择类型',
|
||||
options: [
|
||||
{ label: '摄像头', value: '摄像头' },
|
||||
{ label: '电表', value: '电表' },
|
||||
{ label: '水表', value: '水表' },
|
||||
{ label: '温湿度计', value: '温湿度计' },
|
||||
],
|
||||
},
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
{
|
||||
label: 'SN',
|
||||
field: 'sn',
|
||||
component: 'Input',
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
{
|
||||
label: '维修状态',
|
||||
field: 'maintainStatus',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: {
|
||||
placeholder: '请选择类型',
|
||||
options: [
|
||||
{ label: '正常', value: '0' },
|
||||
{ label: '报修', value: '1' },
|
||||
{ label: '报废', value: '2' },
|
||||
],
|
||||
},
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
// {
|
||||
// label: '机构',
|
||||
// field: 'departId',
|
||||
// component: 'JDictSelectTag',
|
||||
// slot: 'depart',
|
||||
// // componentProps: {
|
||||
// // placeholder: '请选择机构',
|
||||
// // dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc',
|
||||
// // },
|
||||
// colProps: { span: 6 },
|
||||
// },
|
||||
{
|
||||
label: '绑定机构',
|
||||
label: '机构名称',
|
||||
field: 'orgCode',
|
||||
component: 'JDictSelectTag',
|
||||
slot: 'depart',
|
||||
|
|
@ -120,7 +99,7 @@ export const searchFormSchema: FormSchema[] = [
|
|||
colProps: { span: 6 },
|
||||
},
|
||||
{
|
||||
label: '绑定区域',
|
||||
label: '区域名称',
|
||||
field: 'nuId',
|
||||
component: 'JDictSelectTag',
|
||||
slot: 'nuArea',
|
||||
|
|
@ -131,52 +110,77 @@ export const searchFormSchema: FormSchema[] = [
|
|||
colProps: { span: 6 },
|
||||
},
|
||||
{
|
||||
label: '发往机构',
|
||||
field: 'reserveDepartId',
|
||||
label: '设备类型',
|
||||
field: 'deviceType',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: {
|
||||
placeholder: '请选择区域',
|
||||
dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc',
|
||||
placeholder: '请选择类型',
|
||||
options: [
|
||||
{ label: '录像机', value: '录像机' },
|
||||
{ label: '摄像头', value: '摄像头' },
|
||||
{ label: '路由器', value: '路由器' },
|
||||
{ label: '交换机', value: '交换机' },
|
||||
{ label: '无线AP', value: '无线AP' },
|
||||
{ label: '智能电表', value: '智能电表' },
|
||||
{ label: '智能水表', value: '智能水表' },
|
||||
{ label: '温湿度计', value: '温湿度计' },
|
||||
],
|
||||
},
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
{
|
||||
label: '在线状态',
|
||||
field: 'deviceStatus',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: {
|
||||
placeholder: '请选择在线状态',
|
||||
options: [
|
||||
{ label: '在线', value: '在线' },
|
||||
{ label: '离线', value: '离线' },
|
||||
],
|
||||
},
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
{
|
||||
label: '分配状态',
|
||||
field: 'izAllocate',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: {
|
||||
placeholder: '请选择分配状态',
|
||||
options: [
|
||||
{ label: '未分配', value: '未分配' },
|
||||
{ label: '已分配', value: '已分配' },
|
||||
],
|
||||
},
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
{
|
||||
label: '设备状态',
|
||||
field: 'maintainStatus',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: {
|
||||
placeholder: '请选择设备状态',
|
||||
options: [
|
||||
{ label: '正常', value: '0' },
|
||||
{ label: '释放', value: '1' },
|
||||
{ label: '损坏', value: '2' },
|
||||
],
|
||||
},
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
];
|
||||
|
||||
export const formSchema: FormSchema[] = [
|
||||
//列表数据
|
||||
export const logColumns: BasicColumn[] = [
|
||||
{
|
||||
label: '',
|
||||
field: 'id',
|
||||
component: 'Input',
|
||||
show: false,
|
||||
title: '备注',
|
||||
align:"center",
|
||||
dataIndex: 'remark'
|
||||
},
|
||||
{
|
||||
label: '选择机构',
|
||||
field: 'reserveDepartId',
|
||||
component: 'JSelectDept',
|
||||
componentProps: {
|
||||
//是否开启异步加载
|
||||
sync: false,
|
||||
//是否显示复选框
|
||||
checkable: true,
|
||||
//是否显示选择按钮
|
||||
showButton: false,
|
||||
//父子节点选中状态不再关联
|
||||
checkStrictly: false,
|
||||
//选择框标题
|
||||
modalTitle: '请选择机构',
|
||||
},
|
||||
required: true
|
||||
},
|
||||
{
|
||||
label: '备注',
|
||||
field: 'remark',
|
||||
component: 'InputTextArea',
|
||||
componentProps: {
|
||||
showCount: true,
|
||||
maxlength: 1000,
|
||||
autosize:{
|
||||
minRows: 5
|
||||
},
|
||||
}
|
||||
title: '创建时间',
|
||||
align:"center",
|
||||
dataIndex: 'updateDate',
|
||||
width: 160
|
||||
},
|
||||
];
|
||||
|
|
|
|||
Loading…
Reference in New Issue