Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/api/property/meter/lightInfo/index.ts

@@ -59,3 +59,21 @@ export function lightInfoUpdate(data: LightInfoForm) {
 export function lightInfoRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/property/lightInfo/${id}`);
 }
+
+/**
+ * 更新灯控开关状态
+ * @param data
+ * @returns void
+ */
+export function switchSingleLight(data: LightInfoForm) {
+  return requestClient.postWithMsg<void>('/property/lightInfo/switch', data);
+}
+
+/**
+ * 批量更新灯控开关状态
+ * @param data
+ * @returns void
+ */
+export function switchBatchLight(data: LightInfoForm) {
+  return requestClient.postWithMsg<void>('/property/lightInfo/switch', data);
+}

apps/web-antd/src/api/property/meter/lightInfo/model.d.ts

@@ -14,7 +14,7 @@ export interface LightInfoVO {
   /**
    * 开关状态（0：关，1：开）
    */
-  isOn: number;
+  isOn: boolean;
 
   /**
    * 灯控模块编码
@@ -62,7 +62,7 @@ export interface LightInfoForm extends BaseEntity {
   /**
    * 开关状态（0：关，1：开）
    */
-  isOn?: number;
+  isOn: boolean;
 
   /**
    * 灯控模块编码

apps/web-antd/src/views/property/meter/lightInfo/data.ts

@@ -22,7 +22,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '位置描述',
     field: 'locationRemark',
   },
-
   {
     title: '楼    层',
     field: 'floorName',
@@ -30,7 +29,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '开关状态',
     field: 'isOn',
-     slots: { default: 'isOn' },
+    slots: { default: 'isOn' },
   },
   {
     field: 'action',

apps/web-antd/src/views/property/meter/lightInfo/index.vue

@@ -1,26 +1,27 @@
 <script setup lang="ts">
 
 import { TableSwitch } from "#/components/table"
-import { Page, useVbenDrawer, type VbenFormProps } from '@vben/common-ui';
+import { Page, useVbenDrawer, type VbenFormProps } from '@vben/common-ui'
 
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import { Modal, Popconfirm, Space } from 'ant-design-vue'
 
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
   type VxeGridProps
-} from '#/adapter/vxe-table';
+} from '#/adapter/vxe-table'
 
 import {
-  lightInfoExport,
   lightInfoList,
+  lightInfoExport,
   lightInfoRemove,
-} from '#/api/property/meter/lightInfo';
-import type { LightInfoForm } from '#/api/property/meter/lightInfo/model';
-import { commonDownloadExcel } from '#/utils/file/download';
+  switchSingleLight,
+} from '#/api/property/meter/lightInfo'
+import type { LightInfoForm } from '#/api/property/meter/lightInfo/model'
+import { commonDownloadExcel } from '#/utils/file/download'
 
-import lightInfoDrawer from './lightInfo-drawer.vue';
-import { columns, querySchema } from './data';
+import lightInfoDrawer from './lightInfo-drawer.vue'
+import { columns, querySchema } from './data'
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -31,16 +32,7 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
-  // 不需要直接删除
-  // fieldMappingTime: [
-  //  [
-  //    'createTime',
-  //    ['params[beginTime]', 'params[endTime]'],
-  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //  ],
-  // ],
-};
+}
 
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
@@ -64,7 +56,7 @@ const gridOptions: VxeGridProps = {
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,
-        });
+        })
       },
     },
   },
@@ -73,50 +65,50 @@ const gridOptions: VxeGridProps = {
   },
   // 表格全局唯一表示 保存列配置需要用到
   id: 'property-lightInfo-index'
-};
+}
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
   formOptions,
   gridOptions,
-});
+})
 
 const [LightInfoDrawer, drawerApi] = useVbenDrawer({
   connectedComponent: lightInfoDrawer,
-});
+})
 
 function handleAdd() {
-  drawerApi.setData({});
-  drawerApi.open();
+  drawerApi.setData({})
+  drawerApi.open()
 }
 
 async function handleEdit(row: Required<LightInfoForm>) {
-  drawerApi.setData({ id: row.id });
-  drawerApi.open();
+  drawerApi.setData({ id: row.id })
+  drawerApi.open()
 }
 
 async function handleDelete(row: Required<LightInfoForm>) {
-  await lightInfoRemove(row.id);
-  await tableApi.query();
+  await lightInfoRemove(row.id)
+  await tableApi.query()
 }
 
 function handleMultiDelete() {
-  const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: Required<LightInfoForm>) => row.id);
+  const rows = tableApi.grid.getCheckboxRecords()
+  const ids = rows.map((row: Required<LightInfoForm>) => row.id)
   Modal.confirm({
     title: '提示',
     okType: 'danger',
     content: `确认删除选中的${ids.length}条记录吗？`,
     onOk: async () => {
-      await lightInfoRemove(ids);
-      await tableApi.query();
+      await lightInfoRemove(ids)
+      await tableApi.query()
     },
-  });
+  })
 }
 
 function handleDownloadExcel() {
   commonDownloadExcel(lightInfoExport, '灯控开关信息数据', tableApi.formApi.form.values, {
     fieldMappingTime: formOptions.fieldMappingTime,
-  });
+  })
 }
 </script>
 
@@ -125,55 +117,38 @@ function handleDownloadExcel() {
     <BasicTable table-title="灯控开关信息列表">
       <template #toolbar-tools>
         <Space>
-          <a-button
-            v-access:code="['property:lightInfo:export']"
-            @click="handleDownloadExcel"
-          >
-            {{ $t('pages.common.export') }}
+           <a-button type="primary" v-access:code="['property:lightInfo:add']" @click="handleAdd">
+            {{ $t('pages.common.add') }}
           </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary" 
-            v-access:code="['property:lightInfo:remove']" 
-            @click="handleMultiDelete">
+          <a-button :disabled="!vxeCheckboxChecked(tableApi)" danger type="primary"
+            v-access:code="['property:lightInfo:remove']" @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:lightInfo:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
+          <a-button :disabled="!vxeCheckboxChecked(tableApi)" danger type="primary">
+            关灯
+          </a-button>
+          <a-button :disabled="!vxeCheckboxChecked(tableApi)" success type="primary">
+            开灯
           </a-button>
         </Space>
       </template>
       <template #action="{ row }">
         <Space>
-          <ghost-button
-            v-access:code="['property:lightInfo:edit']"
-            @click.stop="handleEdit(row)"
-          >
+          <ghost-button v-access:code="['property:lightInfo:edit']" @click.stop="handleEdit(row)">
             {{ $t('pages.common.edit') }}
           </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              danger
-              v-access:code="['property:lightInfo:remove']"
-              @click.stop=""
-            >
+          <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="确认删除？"
+            @confirm="handleDelete(row)">
+            <ghost-button danger v-access:code="['property:lightInfo:remove']" @click.stop="">
               {{ $t('pages.common.delete') }}
             </ghost-button>
           </Popconfirm>
         </Space>
       </template>
       <template #isOn="{ row }">
-        <TableSwitch :checkedValue=true :unCheckedValue=false :value="row.isOn" @reload="() => tableApi.query()" />
+        <TableSwitch :checkedValue=true :unCheckedValue=false v-model:value="row.isOn" checked-children="开"
+          un-checked-children="关" :api="() => switchSingleLight({'id':row.id, 'isOn':row.isOn})"
+          @reload="() => tableApi.query()" />
       </template>
     </BasicTable>
     <LightInfoDrawer @reload="tableApi.query()" />