diff --git a/src/api/common/api.ts b/src/api/common/api.ts index 9f1e975..b18a5f1 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -20,7 +20,7 @@ enum Api { } /** - * 护理单元列表 + * 区域列表 * @param params */ export const getNuList = (params) => { diff --git a/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue b/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue index 4ca1771..b268424 100644 --- a/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue +++ b/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue @@ -65,7 +65,7 @@ //选择框标题 modalTitle: { type: String, - default: '护理单元选择', + default: '区域选择', }, }, emits: ['register', 'getSelectResult'], @@ -112,7 +112,7 @@ //update-end-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位 schemas: [ { - label: '护理单元名称', + label: '区域名称', field: 'nuName', component: 'JInput', colProps: { span: 10 }, @@ -122,13 +122,13 @@ //定义表格列 const columns = [ { - title: '护理单元ID', + title: '区域ID', dataIndex: 'nuId', width: 180, align: 'left', }, { - title: '护理单元名称', + title: '区域名称', dataIndex: 'nuName', // width: 180, }, @@ -144,7 +144,7 @@ rowKey: 'nuId', columns: [ { - title: '护理单元名称', + title: '区域名称', dataIndex: 'nuName', width: 40, }, diff --git a/src/components/Sync/SyncSimpleComponent.vue b/src/components/Sync/SyncSimpleComponent.vue index 8d4eae0..d56d238 100644 --- a/src/components/Sync/SyncSimpleComponent.vue +++ b/src/components/Sync/SyncSimpleComponent.vue @@ -163,7 +163,7 @@ import { useMessage } from "/@/hooks/web/useMessage"; import AsyncListComponent from '@/components/dataAsync/AsyncMainList.vue' const props = defineProps({ - syncType: '',//护理单元'nuBaseInfo' + syncType: '',//区域'nuBaseInfo' showSyncBtn: true, }); const emit = defineEmits(['orgChanged', 'handleAsync']); diff --git a/src/views/iot/baseIot/CheckBaseIotList.vue b/src/views/iot/baseIot/CheckBaseIotList.vue index 0fa72a3..4203cf1 100644 --- a/src/views/iot/baseIot/CheckBaseIotList.vue +++ b/src/views/iot/baseIot/CheckBaseIotList.vue @@ -124,7 +124,7 @@ function searchReset() { getBaseList(item); } - //获取护理单元及物联设备数量 + //获取区域及物联设备数量 function getBaseList(item){ defHttp.get({ url: '/admin/nuBaseInfo/nuBaseInfo/getBaseWlsbList', params: {orgCode:item.orgCode} }).then((res) => { baseList.value = res; diff --git a/src/views/iot/tplink/camera/camera.data.ts b/src/views/iot/tplink/camera/camera.data.ts index d6b3921..3336fe4 100644 --- a/src/views/iot/tplink/camera/camera.data.ts +++ b/src/views/iot/tplink/camera/camera.data.ts @@ -55,12 +55,12 @@ export const columns: BasicColumn[] = [ // dataIndex: 'locationName' // }, // { - // title: '护理单元', + // title: '区域', // align: "center", // dataIndex: 'nuId_dictText', // }, // { - // title: '护理单元', + // title: '区域', // align: "center", // dataIndex: 'nuName' // }, @@ -171,7 +171,7 @@ export const formSchema: FormSchema[] = [ // dynamicDisabled: true // }, // { - // label: '护理单元', + // label: '区域', // field: 'nuId', // component: 'JSelectNu', // componentProps: { diff --git a/src/views/iot/tplink/camera/components/CameraInfoList.vue b/src/views/iot/tplink/camera/components/CameraInfoList.vue index 8fd9a65..aa0d7ed 100644 --- a/src/views/iot/tplink/camera/components/CameraInfoList.vue +++ b/src/views/iot/tplink/camera/components/CameraInfoList.vue @@ -45,7 +45,7 @@ import {ref, reactive, createVNode, h, onMounted, watch, unref} from 'vue'; //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '护理单元-物联管理-摄像头信息', + title: '区域-物联管理-摄像头信息', api: list, columns, canResize: false, diff --git a/src/views/iot/tplink/camera/components/CameraRecordList.vue b/src/views/iot/tplink/camera/components/CameraRecordList.vue index f5fe0d8..9303fee 100644 --- a/src/views/iot/tplink/camera/components/CameraRecordList.vue +++ b/src/views/iot/tplink/camera/components/CameraRecordList.vue @@ -44,7 +44,7 @@ import {ref, reactive, createVNode, h, onMounted, watch, unref} from 'vue'; //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '护理单元-物联管理-录像信息', + title: '区域-物联管理-录像信息', api: searchVideo, columns: recordingColumns, canResize: false, diff --git a/src/views/iot/tplink/plan/components/PlanList.vue b/src/views/iot/tplink/plan/components/PlanList.vue index 2495139..5ba49a8 100644 --- a/src/views/iot/tplink/plan/components/PlanList.vue +++ b/src/views/iot/tplink/plan/components/PlanList.vue @@ -55,7 +55,7 @@ //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '护理单元-物联管理-录像计划', + title: '区域-物联管理-录像计划', api: list, columns, rowKey : "ids", diff --git a/src/views/iot/tplink/project/ProjectInfoList.vue b/src/views/iot/tplink/project/ProjectInfoList.vue index c1a0252..2ca7c22 100644 --- a/src/views/iot/tplink/project/ProjectInfoList.vue +++ b/src/views/iot/tplink/project/ProjectInfoList.vue @@ -43,7 +43,7 @@ //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '护理单元-物联管理-机构信息', + title: '区域-物联管理-机构信息', api: list, columns, canResize:false, diff --git a/src/views/iot/tplink/region/components/RegionInfoList.vue b/src/views/iot/tplink/region/components/RegionInfoList.vue index 1a8f88a..7132744 100644 --- a/src/views/iot/tplink/region/components/RegionInfoList.vue +++ b/src/views/iot/tplink/region/components/RegionInfoList.vue @@ -45,7 +45,7 @@ //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '护理单元-物联管理-区域信息', + title: '区域-物联管理-区域信息', api: list, columns, canResize:false, diff --git a/src/views/iot/tq/electricity/electricity.data.ts b/src/views/iot/tq/electricity/electricity.data.ts index 9622191..56e7b37 100644 --- a/src/views/iot/tq/electricity/electricity.data.ts +++ b/src/views/iot/tq/electricity/electricity.data.ts @@ -102,11 +102,11 @@ export const searchFormSchema: FormSchema[] = [ // colProps: { span: 6 }, // }, // { - // label: '护理单元', + // label: '区域', // field: 'deviceStatus', // component: 'JDictSelectTag', // componentProps: { - // placeholder: '请选择护理单元', + // placeholder: '请选择区域', // dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', // }, // colProps: { span: 6 }, diff --git a/src/views/iot/tq/electricity/index.vue b/src/views/iot/tq/electricity/index.vue index e495583..fed4398 100644 --- a/src/views/iot/tq/electricity/index.vue +++ b/src/views/iot/tq/electricity/index.vue @@ -109,7 +109,7 @@ import { defHttp } from '/@/utils/http/axios'; (selectedRowKeys.value = []) && reload(); } - //护理单元回调 + //区域回调 function handleHldyParams(params){ defHttp.post({ url: "/iot/tq/electricityMeter/editHldy", @@ -245,7 +245,7 @@ import { defHttp } from '/@/utils/http/axios'; apiLogModal.value.showApiLog(record); } /** - * 配置护理单元 + * 配置区域 */ function handlePzhldy(record){ hldyUtilsModal.value.disableSubmit = true; diff --git a/src/views/iot/tq/water/index.vue b/src/views/iot/tq/water/index.vue index 30d3ad3..114f76e 100644 --- a/src/views/iot/tq/water/index.vue +++ b/src/views/iot/tq/water/index.vue @@ -239,14 +239,14 @@ apiLogModal.value.showApiLog(record); } /** - * 配置护理单元 + * 配置区域 */ function handlePzhldy(record){ hldyUtilsModal.value.disableSubmit = true; hldyUtilsModal.value.edit(record); } - //护理单元回调 + //区域回调 function handleHldyParams(params){ defHttp.post({ url: "/iot/tq/waterMeter/editHldy", diff --git a/src/views/iot/tq/water/water.data.ts b/src/views/iot/tq/water/water.data.ts index a9be9ba..b9d429d 100644 --- a/src/views/iot/tq/water/water.data.ts +++ b/src/views/iot/tq/water/water.data.ts @@ -110,11 +110,11 @@ export const searchFormSchema: FormSchema[] = [ // colProps: { span: 6 }, // }, // { - // label: '护理单元', + // label: '区域', // field: 'deviceStatus', // component: 'JDictSelectTag', // componentProps: { - // placeholder: '请选择护理单元', + // placeholder: '请选择区域', // dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', // }, // colProps: { span: 6 }, diff --git a/src/views/iot/yiweilian/humid.data.ts b/src/views/iot/yiweilian/humid.data.ts index bd3a726..c520382 100644 --- a/src/views/iot/yiweilian/humid.data.ts +++ b/src/views/iot/yiweilian/humid.data.ts @@ -98,11 +98,11 @@ export const searchFormSchema: FormSchema[] = [ // colProps: { span: 6 }, // }, // { - // label: '护理单元', + // label: '区域', // field: 'deviceStatus', // component: 'JDictSelectTag', // componentProps: { - // placeholder: '请选择护理单元', + // placeholder: '请选择区域', // dictCode: 'nu_base_info,nu_name,id,del_flag = 0 order by nu_name asc', // }, // colProps: { span: 6 }, diff --git a/src/views/iot/yiweilian/index.vue b/src/views/iot/yiweilian/index.vue index e47ee1a..c0d4282 100644 --- a/src/views/iot/yiweilian/index.vue +++ b/src/views/iot/yiweilian/index.vue @@ -192,7 +192,7 @@ } - //护理单元回调 + //区域回调 function handleHldyParams(params){ defHttp.post({ url: "/iot/yiweilian/humidDevice/editHldy", @@ -203,7 +203,7 @@ }) } /** - * 配置护理单元 + * 配置区域 */ function handlePzhldy(record){ hldyUtilsModal.value.disableSubmit = true; diff --git a/src/views/iotsync/components/OrgSelect.vue b/src/views/iotsync/components/OrgSelect.vue index 717b974..a747cf3 100644 --- a/src/views/iotsync/components/OrgSelect.vue +++ b/src/views/iotsync/components/OrgSelect.vue @@ -5,14 +5,15 @@
机构信息: - 请先选择机构 - {{ orgData?.departName }} + 请先选择机构 + {{ orgData?.departName }} + 机构编码：{{ orgData?.orgCode || '-' }}
- + 重新选择
-
+
@@ -136,15 +137,16 @@ const selectedOrgs = ref([]) const handleOrgSelected = async (org) => { if (!!orgData.value && orgData.value.orgId != org.orgId) { - Modal.confirm({ - title: '变更机构提醒', - content: '是否变更机构！', - okText: '确认', - cancelText: '取消', - onOk: async () => { - await loadOrgData(org); - }, - }); + // Modal.confirm({ + // title: '变更机构提醒', + // content: '是否变更机构！', + // okText: '确认', + // cancelText: '取消', + // onOk: async () => { + // await loadOrgData(org); + // }, + // }); + await loadOrgData(org); } else { await loadOrgData(org); } @@ -221,13 +223,14 @@ defineExpose({ align-items: center; margin-bottom: 5px; padding-bottom: 5px; - border-bottom: 1px solid #f0f0f0; + // border-bottom: 1px solid #f0f0f0; height: 38px; } .org-title { display: flex; align-items: center; + margin-top: 9px; .base-info-label { font-weight: 600; diff --git a/src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts b/src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts index 5256637..68e30a2 100644 --- a/src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts +++ b/src/views/synchronization/nuBaseInfo/NuBaseInfo.data.ts @@ -6,12 +6,12 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '护理单元名称', + title: '区域名称', align: "center", dataIndex: 'nuName' }, { - title: '护理单元编码', + title: '区域编码', align: "center", dataIndex: 'nuId' }, @@ -27,15 +27,39 @@ export const columns: BasicColumn[] = [ // width:100 // }, ]; -//已选择列表数据 -export const selectedColumns: BasicColumn[] = [ +//列表数据 +export const columnsSync: BasicColumn[] = [ { - title: '护理单元名称', + title: '区域名称', align: "center", dataIndex: 'nuName' }, { - title: '护理单元编码', + title: '区域编码', + align: "center", + dataIndex: 'nuId' + }, + { + title: '区域标签', + align: "center", + dataIndex: 'areaFlag_dictText' + }, + { + title: '同步状态', + align: "center", + dataIndex: 'izSync_dictText', + width:100 + }, +]; +//已选择列表数据 +export const selectedColumns: BasicColumn[] = [ + { + title: '区域名称', + align: "center", + dataIndex: 'nuName' + }, + { + title: '区域编码', align: "center", dataIndex: 'nuId' }, @@ -59,7 +83,7 @@ export const selectedColumns: BasicColumn[] = [ ]; // 高级查询数据 export const superQuerySchema = { - nuName: {title: '护理单元名称',order: 0,view: 'text', type: 'string',}, + nuName: {title: '区域名称',order: 0,view: 'text', type: 'string',}, areaFlag: {title: '区域标签',order: 1,view: 'list', type: 'string',dictCode: 'nu_type',}, status: {title: '使用状态',order: 2,view: 'list', type: 'string',dictCode: 'nu_status',}, }; diff --git a/src/views/synchronization/nuBaseInfo/NuBaseInfoList.vue b/src/views/synchronization/nuBaseInfo/NuBaseInfoList.vue index 0feff68..daca8c8 100644 --- a/src/views/synchronization/nuBaseInfo/NuBaseInfoList.vue +++ b/src/views/synchronization/nuBaseInfo/NuBaseInfoList.vue @@ -77,7 +77,7 @@ const userStore = useUserStore(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '护理单元', + title: '区域', api: list, columns, canResize: false, diff --git a/src/views/synchronization/nuBaseInfo/NuBaseInfoSyncList.vue b/src/views/synchronization/nuBaseInfo/NuBaseInfoSyncList.vue new file mode 100644 index 0000000..6cc60ea --- /dev/null +++ b/src/views/synchronization/nuBaseInfo/NuBaseInfoSyncList.vue @@ -0,0 +1,305 @@ + + + + + diff --git a/src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue b/src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue index fa2c84d..25dc941 100644 --- a/src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue +++ b/src/views/synchronization/nuBaseInfo/components/NuBaseInfoForm.vue @@ -6,13 +6,13 @@ name="NuBaseInfoForm"> - - + - + @@ -48,7 +48,6 @@ const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: () => ({}) }, formBpm: { type: Boolean, default: true }, - orgCode: '' }); const formRef = ref(); const useForm = Form.useForm; @@ -57,6 +56,7 @@ const formData = reactive>({ id: '', nuName: '', nuId: '', + orgCode: '', areaFlag: '', status: '', }); @@ -85,8 +85,9 @@ const disabled = computed(() => { /** * 新增 */ -function add() { - edit({}); +function add(record) { + console.log("🚀 ~ add ~ record:", record) + edit(record); } /** @@ -143,7 +144,6 @@ async function submitForm() { if (!model.id) { model.status = "0"; } - model.orgCode = props.orgCode await saveOrUpdate(model, isUpdate.value) .then((res) => { if (res.success) { diff --git a/src/views/synchronization/nuBaseInfo/components/NuBaseInfoModal.vue b/src/views/synchronization/nuBaseInfo/components/NuBaseInfoModal.vue index 1cd3ca6..16540b1 100644 --- a/src/views/synchronization/nuBaseInfo/components/NuBaseInfoModal.vue +++ b/src/views/synchronization/nuBaseInfo/components/NuBaseInfoModal.vue @@ -24,11 +24,11 @@ const props = defineProps({ /** * 新增 */ -function add() { +function add(record) { title.value = '新增'; visible.value = true; nextTick(() => { - registerForm.value.add(); + registerForm.value.add(record); }); } diff --git a/src/views/synchronization/nuBaseInfo/index.vue b/src/views/synchronization/nuBaseInfo/index.vue index f326657..d40266e 100644 --- a/src/views/synchronization/nuBaseInfo/index.vue +++ b/src/views/synchronization/nuBaseInfo/index.vue @@ -1,297 +1,73 @@ - \ No newline at end of file + +.base-class { + :deep(.ant-card .ant-card-body) { + padding-top: 10px !important; + padding-bottom: 10px !important; + } +} + diff --git a/src/views/system/depart/depart.data.ts b/src/views/system/depart/depart.data.ts index d691e89..b4e1858 100644 --- a/src/views/system/depart/depart.data.ts +++ b/src/views/system/depart/depart.data.ts @@ -105,7 +105,7 @@ export function useBasicFormSchema() { // rules: [ // { // required: true, - // message: '请填写护理单元长者入住应缴金额', + // message: '请填写区域长者入住应缴金额', // }, // ], // }, diff --git a/src/views/utils/nuUtils/HldyUtilsIndex.vue b/src/views/utils/nuUtils/HldyUtilsIndex.vue index 2140f55..5ccee26 100644 --- a/src/views/utils/nuUtils/HldyUtilsIndex.vue +++ b/src/views/utils/nuUtils/HldyUtilsIndex.vue @@ -20,7 +20,7 @@ const hldyUtilsListModal = ref(); const departInfo = ref({}); const emit = defineEmits(['register', 'ok']); - //护理单元回调 + //区域回调 function hldyCallback(record) { console.log("🚀 ~ hldyCallback ~ record:", record) diff --git a/src/views/utils/nuUtils/HldyUtilsList.vue b/src/views/utils/nuUtils/HldyUtilsList.vue index 6f83c8e..b5e687b 100644 --- a/src/views/utils/nuUtils/HldyUtilsList.vue +++ b/src/views/utils/nuUtils/HldyUtilsList.vue @@ -11,7 +11,7 @@