新增预警页面

web-vue/packages/biz/api/biz/dataReportUser.ts

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author gaoxq
+ */
+import { defHttp } from '@jeesite/core/utils/http/axios';
+import { useGlobSetting } from '@jeesite/core/hooks/setting';
+import { BasicModel, Page } from '@jeesite/core/api/model/baseModel';
+import { UploadApiResult } from '@jeesite/core/api/sys/upload';
+import { UploadFileParams } from '@jeesite/types/axios';
+import { AxiosProgressEvent } from 'axios';
+
+const { ctxPath, adminPath } = useGlobSetting();
+
+export interface BizDataReportUser extends BasicModel<BizDataReportUser> {
+  createTime?: string; // 记录时间
+  dataReportId: string; // data_report_id
+  userCode: string; // user_code
+  userName?: string; // user_name
+  ustatus: string; // ustatus
+  routePath: string;
+  name: string;
+  image: string;
+}
+
+export const bizDataReportUserList = (params?: BizDataReportUser | any) =>
+  defHttp.get<BizDataReportUser>({ url: adminPath + '/biz/dataReportUser/list', params });
+  
+export const bizDataReportUserListAll = (params?: BizDataReportUser | any) =>
+  defHttp.get<BizDataReportUser[]>({ url: adminPath + '/biz/dataReportUser/listAll', params });
+
+export const bizDataReportUserListData = (params?: BizDataReportUser | any) =>
+  defHttp.post<Page<BizDataReportUser>>({ url: adminPath + '/biz/dataReportUser/listData', params });
+
+export const bizDataReportUserForm = (params?: BizDataReportUser | any) =>
+  defHttp.get<BizDataReportUser>({ url: adminPath + '/biz/dataReportUser/form', params });
+
+export const bizDataReportUserSave = (params?: any, data?: BizDataReportUser | any) =>
+  defHttp.postJson<BizDataReportUser>({ url: adminPath + '/biz/dataReportUser/save', params, data });
+
+export const bizDataReportUserImportData = (
+  params: UploadFileParams,
+  onUploadProgress: (progressEvent: AxiosProgressEvent) => void,
+) =>
+  defHttp.uploadFile<UploadApiResult>(
+    {
+      url: ctxPath + adminPath + '/biz/dataReportUser/importData',
+      onUploadProgress,
+    },
+    params,
+  );
+
+export const bizDataReportUserDelete = (params?: BizDataReportUser | any) =>
+  defHttp.get<BizDataReportUser>({ url: adminPath + '/biz/dataReportUser/delete', params });

web-vue/packages/biz/views/biz/dataReport/erp/components/ChartBarAccount.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="账户汇总图" style="width: 100%; height: 400px; margin: 4px 0;">
+  <Card title="账户汇总" style="width: 100%; height: 400px; margin: 4px 0;">
     <div ref="chartDom" style="width: 100%; height: 300px;"></div>
   </Card>
 </template>

web-vue/packages/biz/views/biz/dataReport/erp/components/ChartBarCycle.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="周期汇总图" style="width: 100%; height: 400px; margin: 4px 0;">
+  <Card title="周期汇总" style="width: 100%; height: 400px; margin: 4px 0;">
     <div ref="chartDom" style="width: 100%; height: 300px;"></div>
   </Card>
 </template>

web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineExp.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="支出柱线图" style="width: 100%; height: 400px; margin: 4px 0;">
+  <Card title="支出汇总" style="width: 100%; height: 400px; margin: 4px 0;">
     <div ref="chartDom" style="width: 100%; height: 300px;"></div>
   </Card>
 </template>

web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineInc.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="收入柱线图" style="width: 100%; height: 400px; margin: 4px 0;">
+  <Card title="收入汇总" style="width: 100%; height: 400px; margin: 4px 0;">
     <div ref="chartDom" style="width: 100%; height: 300px;"></div>
   </Card>
 </template>

web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineRatio.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="收支柱线图" style="width: 100%; height: 400px; margin: 4px 0;">
+  <Card title="收支汇总" style="width: 100%; height: 400px; margin: 4px 0;">
     <div ref="chartDom" style="width: 100%; height: 300px;"></div>
   </Card>
 </template>

web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineType.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="用途柱线图" style="width: 100%; height: 400px; margin: 4px 0;">
+  <Card title="用途汇总" style="width: 100%; height: 400px; margin: 4px 0;">
     <div ref="chartDom" style="width: 100%; height: 300px;"></div>
   </Card>
 </template>

web-vue/packages/biz/views/biz/dataReport/erp/components/ChartPie.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="账户余额占比" style="width: 100%; height: 400px; margin: 4px 0;">
+  <Card title="账户占比" style="width: 100%; height: 400px; margin: 4px 0;">
     <div ref="chartDom" style="width: 100%; height: 300px;"></div>
   </Card>
 </template>

web-vue/packages/biz/views/biz/dataReport/index.vue

@@ -4,7 +4,10 @@
 			<TabPane key="1" tab="指标信息">
 				<DataReport />
 			</TabPane>
-			<TabPane key="2" tab="财务管控">
+			<TabPane key="2" tab="指标用户">
+				<UserReport />
+			</TabPane>
+			<TabPane key="3" tab="财务管控">
 				<ErpReport />
 			</TabPane>
 		</Tabs>
@@ -15,6 +18,7 @@
   import { Tag, Tabs ,TabPane } from 'ant-design-vue';
   import DataReport from './list.vue';
   import ErpReport from './erp/index.vue';
+  import UserReport from './user/list.vue'
   const activeKey = ref('1');
 </script>
 

web-vue/packages/biz/views/biz/dataReport/user/form.vue

@@ -0,0 +1,120 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author gaoxq
+-->
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'biz:dataReportUser:edit'"
+    @register="registerModal"
+    @ok="handleSubmit"
+    width="40%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts" setup name="ViewsBizDataReportUserForm">
+  import { ref, unref, computed } from 'vue';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { router } from '@jeesite/core/router';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
+  import { BizDataReportUser, bizDataReportUserSave, bizDataReportUserForm } from '@jeesite/biz/api/biz/dataReportUser';
+  import { bizDataReportListAll, BizDataReport } from '@jeesite/biz/api/biz/dataReport';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('biz.dataReportUser');
+  const { showMessage } = useMessage();
+  const { meta } = unref(router.currentRoute);
+  const record = ref<BizDataReportUser>({} as BizDataReportUser);
+
+  const getTitle = computed(() => ({
+    icon: meta.icon || 'i-ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增指标用户') : t('编辑指标用户'),
+  }));
+
+  const inputFormSchemas: FormSchema<BizDataReportUser>[] = [
+    {
+      label: t('看板名称'),
+      field: 'dataReportId',
+      component: 'Select',
+	  componentProps: {
+		api: bizDataReportListAll,
+		params: {},
+		fieldNames: { label: 'name', value: 'id' },
+		immediate: true,
+		allowClear: true,
+	  },
+      required: true,
+	  colProps: { md: 24, lg: 24 },
+    },
+    {
+      label: t('用户名称'),
+      field: 'userCode',
+      fieldLabel: 'userName',
+	  component: 'ListSelect',
+	  componentProps: {
+	    selectType: 'userSelect',
+	  },
+      required: true,
+    },
+    {
+      label: t('状态'),
+      field: 'ustatus',
+      component: 'Select',
+      componentProps: {
+        dictType: 'ustatus',
+        allowClear: true,
+      },
+      required: true,
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<BizDataReportUser>({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { md: 24, lg: 12 },
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
+    await resetFields();
+    const res = await bizDataReportUserForm(data);
+    record.value = (res.bizDataReportUser || {}) as BizDataReportUser;
+    record.value.__t = new Date().getTime();
+    await setFieldsValue(record.value);
+    setModalProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setModalProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        id: record.value.id || data.id,
+      };
+      // console.log('submit', params, data, record);
+      const res = await bizDataReportUserSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeModal);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(error.message || t('common.validateError'));
+      }
+      console.log('error', error);
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>

web-vue/packages/biz/views/biz/dataReport/user/formImport.vue

@@ -0,0 +1,103 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author gaoxq
+-->
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    :title="t('导入指标用户')"
+    :okText="t('导入')"
+    @register="registerModal"
+    @ok="handleSubmit"
+    :minHeight="120"
+    :width="400"
+  >
+    <Upload accept=".xls,.xlsx" :file-list="fileList" :before-upload="beforeUpload" @remove="handleRemove">
+      <a-button> <Icon icon="ant-design:upload-outlined" /> {{ t('选择文件') }} </a-button>
+      <span class="ml-4">{{ uploadInfo }}</span>
+    </Upload>
+    <div class="ml-4 mt-4">
+      {{ t('提示：仅允许导入“xls”或“xlsx”格式文件！') }}
+    </div>
+    <div class="mt-4">
+      <a-button @click="handleDownloadTemplate()" type="text">
+        <Icon icon="i-fa:file-excel-o" />
+        {{ t('下载模板') }}
+      </a-button>
+    </div>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { Upload } from 'ant-design-vue';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { useGlobSetting } from '@jeesite/core/hooks/setting';
+  import { downloadByUrl } from '@jeesite/core/utils/file/download';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
+  import { bizDataReportUserImportData } from '@jeesite/biz/api/biz/dataReportUser';
+  import { FileType } from 'ant-design-vue/es/upload/interface';
+  import { AxiosProgressEvent } from 'axios';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('biz.dataReportUser');
+  const { showMessage, showMessageModal } = useMessage();
+
+  const fileList = ref<FileType[]>([]);
+  const uploadInfo = ref('');
+
+  const beforeUpload = (file: FileType) => {
+    fileList.value = [file];
+    return false;
+  };
+
+  const handleRemove = () => {
+    fileList.value = [];
+  };
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(() => {
+    fileList.value = [];
+    uploadInfo.value = '';
+  });
+
+  async function handleDownloadTemplate() {
+    const { ctxAdminPath } = useGlobSetting();
+    downloadByUrl({ url: ctxAdminPath + '/biz/dataReportUser/importTemplate' });
+  }
+
+  function onUploadProgress(progressEvent: AxiosProgressEvent) {
+    const complete = ((progressEvent.loaded / (progressEvent.total || 1)) * 100) | 0;
+    if (complete != 100) {
+      uploadInfo.value = t('正在导入，请稍候') + ' ' + complete + '%...';
+    } else {
+      uploadInfo.value = '';
+    }
+  }
+
+  async function handleSubmit() {
+    try {
+      if (fileList.value.length == 0) {
+        showMessage(t('请选择要导入的数据文件'));
+        return;
+      }
+      setModalProps({ confirmLoading: true });
+      const params = {
+        file: fileList.value[0],
+      };
+      const { data } = await bizDataReportUserImportData(params, onUploadProgress);
+      showMessageModal({ content: data.message });
+      setTimeout(closeModal);
+      emit('success');
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(error.message || t('common.validateError'));
+      }
+      console.log('error', error);
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>

web-vue/packages/biz/views/biz/dataReport/user/list.vue

@@ -0,0 +1,206 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author gaoxq
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button type="default" :loading="loading" @click="handleExport()">
+          <Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
+        </a-button>
+        <a-button type="primary" @click="handleForm({})" v-auth="'biz:dataReportUser:edit'">
+          <Icon icon="i-fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerModal" @success="handleSuccess" />
+    <FormImport @register="registerImportModal" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts" setup name="ViewsBizDataReportUserList">
+  import { onMounted, ref, unref } from 'vue';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { useGlobSetting } from '@jeesite/core/hooks/setting';
+  import { downloadByUrl } from '@jeesite/core/utils/file/download';
+  import { router } from '@jeesite/core/router';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
+  import { BizDataReportUser, bizDataReportUserList } from '@jeesite/biz/api/biz/dataReportUser';
+  import { bizDataReportUserDelete, bizDataReportUserListData } from '@jeesite/biz/api/biz/dataReportUser';  
+  import { useModal } from '@jeesite/core/components/Modal';
+  import { FormProps } from '@jeesite/core/components/Form';
+  import InputForm from './form.vue';
+  import FormImport from './formImport.vue';
+
+  const { t } = useI18n('biz.dataReportUser');
+  const { showMessage } = useMessage();
+  const { meta } = unref(router.currentRoute);
+  const record = ref<BizDataReportUser>({} as BizDataReportUser);
+
+  const getTitle = {
+    icon: meta.icon || 'i-ant-design:book-outlined',
+    value: t('指标用户'),
+  };
+  const loading = ref(false);
+
+  const searchForm: FormProps<BizDataReportUser> = {
+    baseColProps: { md: 8, lg: 6 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('记录时间起'),
+        field: 'createTime_gte',
+        component: 'DatePicker',
+        componentProps: {
+          format: 'YYYY-MM-DD HH:mm',
+          showTime: { format: 'HH:mm' },
+        },
+      },
+      {
+        label: t('记录时间止'),
+        field: 'createTime_lte',
+        component: 'DatePicker',
+        componentProps: {
+          format: 'YYYY-MM-DD HH:mm',
+          showTime: { format: 'HH:mm' },
+        },
+      },
+      {
+        label: t('状态'),
+        field: 'ustatus',
+        component: 'Select',
+        componentProps: {
+          dictType: 'ustatus',
+          allowClear: true,
+        },
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn<BizDataReportUser>[] = [
+    {
+      title: t('记录时间'),
+      dataIndex: 'createTime',
+      key: 'a.create_time',
+      sorter: true,
+      width: 180,
+      align: 'left',
+	  fixed: 'left',
+    },
+	{
+	  title: t('看板名称'),
+	  dataIndex: 'name',
+	  key: 'b.name',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
+    {
+      title: t('用户账号'),
+      dataIndex: 'userCode',
+      key: 'a.user_code',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('用户名称'),
+      dataIndex: 'userName',
+      key: 'a.user_name',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'ustatus',
+      key: 'a.ustatus',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'ustatus',
+    },
+  ];
+
+  const actionColumn: BasicColumn<BizDataReportUser> = {
+    width: 160,
+	align: 'center',
+    actions: (record: BizDataReportUser) => [
+      {
+        icon: 'i-clarity:note-edit-line',
+        title: t('编辑'),
+        onClick: handleForm.bind(this, { id: record.id }),
+        auth: 'biz:dataReportUser:edit',
+      },
+      {
+        icon: 'i-ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除'),
+        popConfirm: {
+          title: t('是否确认删除指标用户?'),
+          confirm: handleDelete.bind(this, record),
+        },
+        auth: 'biz:dataReportUser:edit',
+      },
+    ],
+  };
+
+  const [registerTable, { reload, getForm }] = useTable<BizDataReportUser>({
+    api: bizDataReportUserListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+
+  onMounted(async () => {
+    const res = await bizDataReportUserList();
+    record.value = (res.bizDataReportUser || {}) as BizDataReportUser;
+    await getForm().setFieldsValue(record.value);
+  });
+
+  const [registerModal, { openModal }] = useModal();
+
+  function handleForm(record: Recordable) {
+    openModal(true, record);
+  }
+
+  async function handleExport() {
+    loading.value = true;
+    const { ctxAdminPath } = useGlobSetting();
+    await downloadByUrl({
+      url: ctxAdminPath + '/biz/dataReportUser/exportData',
+      params: getForm().getFieldsValue(),
+    });
+    loading.value = false;
+  }
+
+  const [registerImportModal, { openModal: importModal }] = useModal();
+
+  function handleImport() {
+    importModal(true, {});
+  }
+
+  async function handleDelete(record: Recordable) {
+    const params = { id: record.id };
+    const res = await bizDataReportUserDelete(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }
+
+  async function handleSuccess(record: Recordable) {
+    await reload({ record });
+  }
+</script>

web-vue/packages/biz/views/biz/dataReportUser/form.vue

@@ -0,0 +1,113 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author gaoxq
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'biz:dataReportUser:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="70%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts" setup name="ViewsBizDataReportUserForm">
+  import { ref, unref, computed } from 'vue';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { router } from '@jeesite/core/router';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
+  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BizDataReportUser, bizDataReportUserSave, bizDataReportUserForm } from '@jeesite/biz/api/biz/dataReportUser';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('biz.dataReportUser');
+  const { showMessage } = useMessage();
+  const { meta } = unref(router.currentRoute);
+  const record = ref<BizDataReportUser>({} as BizDataReportUser);
+
+  const getTitle = computed(() => ({
+    icon: meta.icon || 'i-ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增指标用户') : t('编辑指标用户'),
+  }));
+
+  const inputFormSchemas: FormSchema<BizDataReportUser>[] = [
+    {
+      label: t('data_report_id'),
+      field: 'dataReportId',
+      component: 'Input',
+      componentProps: {
+        maxlength: 52,
+      },
+      required: true,
+    },
+    {
+      label: t('user_code'),
+      field: 'userCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 52,
+      },
+      required: true,
+    },
+    {
+      label: t('ustatus'),
+      field: 'ustatus',
+      component: 'Select',
+      componentProps: {
+        dictType: 'ustatus',
+        allowClear: true,
+      },
+      required: true,
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<BizDataReportUser>({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { md: 24, lg: 12 },
+  });
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    setDrawerProps({ loading: true });
+    await resetFields();
+    const res = await bizDataReportUserForm(data);
+    record.value = (res.bizDataReportUser || {}) as BizDataReportUser;
+    record.value.__t = new Date().getTime();
+    await setFieldsValue(record.value);
+    setDrawerProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        id: record.value.id || data.id,
+      };
+      // console.log('submit', params, data, record);
+      const res = await bizDataReportUserSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(error.message || t('common.validateError'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>

web-vue/packages/biz/views/biz/dataReportUser/formImport.vue

@@ -0,0 +1,103 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author gaoxq
+-->
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    :title="t('导入指标用户')"
+    :okText="t('导入')"
+    @register="registerModal"
+    @ok="handleSubmit"
+    :minHeight="120"
+    :width="400"
+  >
+    <Upload accept=".xls,.xlsx" :file-list="fileList" :before-upload="beforeUpload" @remove="handleRemove">
+      <a-button> <Icon icon="ant-design:upload-outlined" /> {{ t('选择文件') }} </a-button>
+      <span class="ml-4">{{ uploadInfo }}</span>
+    </Upload>
+    <div class="ml-4 mt-4">
+      {{ t('提示：仅允许导入“xls”或“xlsx”格式文件！') }}
+    </div>
+    <div class="mt-4">
+      <a-button @click="handleDownloadTemplate()" type="text">
+        <Icon icon="i-fa:file-excel-o" />
+        {{ t('下载模板') }}
+      </a-button>
+    </div>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { Upload } from 'ant-design-vue';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { useGlobSetting } from '@jeesite/core/hooks/setting';
+  import { downloadByUrl } from '@jeesite/core/utils/file/download';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
+  import { bizDataReportUserImportData } from '@jeesite/biz/api/biz/dataReportUser';
+  import { FileType } from 'ant-design-vue/es/upload/interface';
+  import { AxiosProgressEvent } from 'axios';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('biz.dataReportUser');
+  const { showMessage, showMessageModal } = useMessage();
+
+  const fileList = ref<FileType[]>([]);
+  const uploadInfo = ref('');
+
+  const beforeUpload = (file: FileType) => {
+    fileList.value = [file];
+    return false;
+  };
+
+  const handleRemove = () => {
+    fileList.value = [];
+  };
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(() => {
+    fileList.value = [];
+    uploadInfo.value = '';
+  });
+
+  async function handleDownloadTemplate() {
+    const { ctxAdminPath } = useGlobSetting();
+    downloadByUrl({ url: ctxAdminPath + '/biz/dataReportUser/importTemplate' });
+  }
+
+  function onUploadProgress(progressEvent: AxiosProgressEvent) {
+    const complete = ((progressEvent.loaded / (progressEvent.total || 1)) * 100) | 0;
+    if (complete != 100) {
+      uploadInfo.value = t('正在导入，请稍候') + ' ' + complete + '%...';
+    } else {
+      uploadInfo.value = '';
+    }
+  }
+
+  async function handleSubmit() {
+    try {
+      if (fileList.value.length == 0) {
+        showMessage(t('请选择要导入的数据文件'));
+        return;
+      }
+      setModalProps({ confirmLoading: true });
+      const params = {
+        file: fileList.value[0],
+      };
+      const { data } = await bizDataReportUserImportData(params, onUploadProgress);
+      showMessageModal({ content: data.message });
+      setTimeout(closeModal);
+      emit('success');
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(error.message || t('common.validateError'));
+      }
+      console.log('error', error);
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>

web-vue/packages/biz/views/biz/dataReportUser/list.vue

@@ -0,0 +1,214 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author gaoxq
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button type="default" :loading="loading" @click="handleExport()">
+          <Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
+        </a-button>
+        <a-button type="default" @click="handleImport()">
+          <Icon icon="i-ant-design:import-outlined" /> {{ t('导入') }}
+        </a-button>
+        <a-button type="primary" @click="handleForm({})" v-auth="'biz:dataReportUser:edit'">
+          <Icon icon="i-fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <a @click="handleForm({ id: record.id })" :title="record.createTime">
+          {{ record.createTime }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <FormImport @register="registerImportModal" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts" setup name="ViewsBizDataReportUserList">
+  import { onMounted, ref, unref } from 'vue';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { useGlobSetting } from '@jeesite/core/hooks/setting';
+  import { downloadByUrl } from '@jeesite/core/utils/file/download';
+  import { router } from '@jeesite/core/router';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
+  import { BizDataReportUser, bizDataReportUserList } from '@jeesite/biz/api/biz/dataReportUser';
+  import { bizDataReportUserDelete, bizDataReportUserListData } from '@jeesite/biz/api/biz/dataReportUser';
+  import { useDrawer } from '@jeesite/core/components/Drawer';
+  import { useModal } from '@jeesite/core/components/Modal';
+  import { FormProps } from '@jeesite/core/components/Form';
+  import InputForm from './form.vue';
+  import FormImport from './formImport.vue';
+
+  const { t } = useI18n('biz.dataReportUser');
+  const { showMessage } = useMessage();
+  const { meta } = unref(router.currentRoute);
+  const record = ref<BizDataReportUser>({} as BizDataReportUser);
+
+  const getTitle = {
+    icon: meta.icon || 'i-ant-design:book-outlined',
+    value: meta.title || t('指标用户管理'),
+  };
+  const loading = ref(false);
+
+  const searchForm: FormProps<BizDataReportUser> = {
+    baseColProps: { md: 8, lg: 6 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('记录时间起'),
+        field: 'createTime_gte',
+        component: 'DatePicker',
+        componentProps: {
+          format: 'YYYY-MM-DD HH:mm',
+          showTime: { format: 'HH:mm' },
+        },
+      },
+      {
+        label: t('记录时间止'),
+        field: 'createTime_lte',
+        component: 'DatePicker',
+        componentProps: {
+          format: 'YYYY-MM-DD HH:mm',
+          showTime: { format: 'HH:mm' },
+        },
+      },
+      {
+        label: t('ustatus'),
+        field: 'ustatus',
+        component: 'Select',
+        componentProps: {
+          dictType: 'ustatus',
+          allowClear: true,
+        },
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn<BizDataReportUser>[] = [
+    {
+      title: t('记录时间'),
+      dataIndex: 'createTime',
+      key: 'a.create_time',
+      sorter: true,
+      width: 230,
+      align: 'left',
+      slot: 'firstColumn',
+    },
+    {
+      title: t('data_report_id'),
+      dataIndex: 'dataReportId',
+      key: 'a.data_report_id',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('user_code'),
+      dataIndex: 'userCode',
+      key: 'a.user_code',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('user_name'),
+      dataIndex: 'userName',
+      key: 'a.user_name',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('ustatus'),
+      dataIndex: 'ustatus',
+      key: 'a.ustatus',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'ustatus',
+    },
+  ];
+
+  const actionColumn: BasicColumn<BizDataReportUser> = {
+    width: 160,
+    actions: (record: BizDataReportUser) => [
+      {
+        icon: 'i-clarity:note-edit-line',
+        title: t('编辑指标用户'),
+        onClick: handleForm.bind(this, { id: record.id }),
+        auth: 'biz:dataReportUser:edit',
+      },
+      {
+        icon: 'i-ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除指标用户'),
+        popConfirm: {
+          title: t('是否确认删除指标用户'),
+          confirm: handleDelete.bind(this, record),
+        },
+        auth: 'biz:dataReportUser:edit',
+      },
+    ],
+  };
+
+  const [registerTable, { reload, getForm }] = useTable<BizDataReportUser>({
+    api: bizDataReportUserListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+
+  onMounted(async () => {
+    const res = await bizDataReportUserList();
+    record.value = (res.bizDataReportUser || {}) as BizDataReportUser;
+    await getForm().setFieldsValue(record.value);
+  });
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleExport() {
+    loading.value = true;
+    const { ctxAdminPath } = useGlobSetting();
+    await downloadByUrl({
+      url: ctxAdminPath + '/biz/dataReportUser/exportData',
+      params: getForm().getFieldsValue(),
+    });
+    loading.value = false;
+  }
+
+  const [registerImportModal, { openModal: importModal }] = useModal();
+
+  function handleImport() {
+    importModal(true, {});
+  }
+
+  async function handleDelete(record: Recordable) {
+    const params = { id: record.id };
+    const res = await bizDataReportUserDelete(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }
+
+  async function handleSuccess(record: Recordable) {
+    await reload({ record });
+  }
+</script>

web-vue/packages/biz/views/biz/dataReportUser/select.ts

@@ -0,0 +1,107 @@
+import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
+import { bizDataReportUserListData } from '@jeesite/biz/api/biz/dataReportUser';
+
+const { t } = useI18n('biz.dataReportUser');
+
+const modalProps = {
+  title: t('指标用户选择'),
+};
+
+const searchForm: FormProps<BizDataReportUser> = {
+  baseColProps: { md: 8, lg: 6 },
+  labelWidth: 90,
+  schemas: [
+    {
+      label: t('记录时间起'),
+      field: 'createTime_gte',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD HH:mm',
+        showTime: { format: 'HH:mm' },
+      },
+    },
+    {
+      label: t('记录时间止'),
+      field: 'createTime_lte',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD HH:mm',
+        showTime: { format: 'HH:mm' },
+      },
+    },
+    {
+      label: t('ustatus'),
+      field: 'ustatus',
+      component: 'Select',
+      componentProps: {
+        dictType: 'ustatus',
+        allowClear: true,
+      },
+    },
+  ],
+};
+
+const tableColumns: BasicColumn<BizDataReportUser>[] = [
+  {
+    title: t('记录时间'),
+    dataIndex: 'createTime',
+    key: 'a.create_time',
+    sorter: true,
+    width: 230,
+    align: 'left',
+    slot: 'firstColumn',
+  },
+  {
+    title: t('data_report_id'),
+    dataIndex: 'dataReportId',
+    key: 'a.data_report_id',
+    sorter: true,
+    width: 130,
+    align: 'left',
+  },
+  {
+    title: t('user_code'),
+    dataIndex: 'userCode',
+    key: 'a.user_code',
+    sorter: true,
+    width: 130,
+    align: 'left',
+  },
+  {
+    title: t('user_name'),
+    dataIndex: 'userName',
+    key: 'a.user_name',
+    sorter: true,
+    width: 130,
+    align: 'left',
+  },
+  {
+    title: t('ustatus'),
+    dataIndex: 'ustatus',
+    key: 'a.ustatus',
+    sorter: true,
+    width: 130,
+    align: 'center',
+    dictType: 'ustatus',
+  },
+];
+
+const tableProps: BasicTableProps = {
+  api: bizDataReportUserListData,
+  beforeFetch: (params) => {
+    params['isAll'] = true;
+    return params;
+  },
+  columns: tableColumns,
+  formConfig: searchForm,
+  rowKey: 'id',
+};
+
+export default {
+  modalProps,
+  tableProps,
+  itemCode: 'id',
+  itemName: 'id',
+  isShowCode: false,
+};

web-vue/packages/biz/views/biz/municipalities/form.vue

@@ -59,8 +59,8 @@
 		onChange: (value: string) => {
 		  provListParams.value.provinceCode = value;
 		},
-		required: true,
 	  },
+	  required: true,
 	  colProps: { md: 24, lg: 24 },
 	},
     {

web-vue/packages/core/layouts/views/desktop/workbench/components/MySchedule.vue

@@ -36,12 +36,15 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
+	import { ref, onMounted, onUnmounted, computed, watch, nextTick } from 'vue';
 	import { useRouter } from 'vue-router';
 	import { Card } from 'ant-design-vue';
 	import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
-	import { bizDataReportListAll, BizDataReport } from '@jeesite/biz/api/biz/dataReport';
+	import { useUserStore } from '@jeesite/core/store/modules/user';
+	import { BizDataReportUser, bizDataReportUserListAll } from '@jeesite/biz/api/biz/dataReportUser';
 
+	const userStore = useUserStore();
+	const userinfo = computed(() => userStore.getUserInfo);
 	// 路由实例
 	const router = useRouter();
 
@@ -52,7 +55,7 @@
 	let scrollRafId: number | null = null;
 	let resizeTimer: NodeJS.Timeout | null = null;
 
-	const cardListData = ref<BizDataReport[]>([]);
+	const cardListData = ref<BizDataReportUser[]>([]);
 
 	// 配置项
 	const scrollStep = 190;
@@ -62,11 +65,12 @@
 	const canScrollLeft = ref(false);
 	const canScrollRight = ref(false);
 	
-	
 	const fetchCardList = async () => {
 	  try {
-	    // 新增错误处理，避免接口异常导致页面卡死
-	    const result = await bizDataReportListAll();
+		const params = {
+			userCode: userinfo.value.loginCode,
+		}
+	    const result = await bizDataReportUserListAll(params);
 	    cardListData.value = result || []; // 防止返回 null 导致渲染异常
 	  } catch (error) {
 	    console.error('获取应用列表失败：', error);