feat:调整界面

src/services/apis/LedgerCustomController.ts

@@ -0,0 +1,22 @@
+// @ts-ignore
+/* eslint-disable */
+
+// 该文件自动生成，请勿手动修改！
+import { defHttp } from '/@/utils/http/axios';
+import { ErrorMessageMode } from '/#/axios';
+            // --------------------------------------------------------------------------
+            // Ledger Custom Controller
+            // --------------------------------------------------------------------------
+
+            ;
+
+
+            /** 修改状态(仅限于表中有delete_mark) PUT /ledger/ledgerCustom */
+export async function putLedgerLedgerCustom(params:API.LedgerCustomUpdateDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
+        ({url: '/ledger/ledgerCustom', data:params},{errorMessageMode:mode});}
+/** 删除数据(仅限于表中有delete_mark) DELETE /ledger/ledgerCustom */
+export async function deleteLedgerLedgerCustom(params:API.LedgerCustomDeleteDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.delete<any>
+        ({url: '/ledger/ledgerCustom', data:params},{errorMessageMode:mode});}
+            

src/services/apis/OutInController.ts

@@ -0,0 +1,23 @@
+// @ts-ignore
+/* eslint-disable */
+
+// 该文件自动生成，请勿手动修改！
+import { defHttp } from '/@/utils/http/axios';
+import { ErrorMessageMode } from '/#/axios';
+            // --------------------------------------------------------------------------
+            // Out In Controller
+            // --------------------------------------------------------------------------
+
+            ;
+
+
+            /** 根据用户id查询车牌号 GET /hikvision/outin/car-list */
+export async function getOutinCarList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.HikvisionCarListVo[]>
+        ({url: '/hikvision/outin/car-list', params:params},{errorMessageMode:mode});}
+/** 海康车辆出入记录查询(分页) GET /hikvision/outin/car-page */
+export async function getOutinCarPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.HikvisionCarOutinPageVo>>
+        ({url: '/hikvision/outin/car-page', params:params},{errorMessageMode:mode});}
+/** 海康记录查询(分页) GET /hikvision/outin/page */
+export async function getOutinPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.HikvisionOutinPageVo>>
+        ({url: '/hikvision/outin/page', params:params},{errorMessageMode:mode});}
+            

src/services/apis/ScheduleController.ts

@@ -26,6 +26,9 @@ export async function getScheduleCourseTableDay(params:any,mode: ErrorMessageMod
 /** 获取当前周次 GET /schedule/schedule/current-week */
 export async function getScheduleCurrentWeek(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.int>
         ({url: '/schedule/schedule/current-week', params:params},{errorMessageMode:mode});}
+/** 查询课程接口 GET /schedule/schedule/getCourseNames */
+export async function getScheduleGetCourseNames(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<any>
+        ({url: '/schedule/schedule/getCourseNames', params:params},{errorMessageMode:mode});}
 /** 获取单点登录地址 GET /schedule/schedule/login-url */
 export async function getScheduleLoginUrl(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<any>
         ({url: '/schedule/schedule/login-url', params:params},{errorMessageMode:mode});}

src/services/apis/index.ts

@@ -48,6 +48,7 @@ import * as FormExecuteController from './FormExecuteController';
 import * as FormHistoryController from './FormHistoryController';
 import * as FormReleaseController from './FormReleaseController';
 import * as FormTemplateController from './FormTemplateController';
+import * as OutInController from './OutInController';
 import * as HolidayDateController from './HolidayDateController';
 import * as InterfaceAuthController from './InterfaceAuthController';
 import * as MagicApiController from './MagicApiController';
@@ -55,6 +56,7 @@ import * as LedgeViewController from './LedgeViewController';
 import * as LedgerExportController from './LedgerExportController';
 import * as LedgerConfigController from './LedgerConfigController';
 import * as LedgerConfigReleaseController from './LedgerConfigReleaseController';
+import * as LedgerCustomController from './LedgerCustomController';
 import * as WfSubscriptionController from './WfSubscriptionController';
 import * as XjrLiteflowChainController from './XjrLiteflowChainController';
 import * as MaterialTaskController from './MaterialTaskController';
@@ -305,6 +307,8 @@ FormHistoryController,
 FormReleaseController,
 /** Form Template Controller */
 FormTemplateController,
+/** Out In Controller */
+OutInController,
 /** Holiday Date Controller */
 HolidayDateController,
 /** Interface Auth Controller */
@@ -319,6 +323,8 @@ LedgerExportController,
 LedgerConfigController,
 /** Ledger Config Release Controller */
 LedgerConfigReleaseController,
+/** Ledger Custom Controller */
+LedgerCustomController,
 /** Wf Subscription Controller */
 WfSubscriptionController,
 /** Xjr Liteflow Chain Controller */

src/services/typing.d.ts

@@ -5361,6 +5361,8 @@ notStayCount?: number;
 orgName?: string;
 /** 住校数量 */
 stayCount?: number;
+/** 手机号 */
+teacherMobile?: string;
 /** 班主任名字 */
 teacherName?: string;
 }
@@ -8335,6 +8337,8 @@ name?: string;
 }
 
 type CourseDetailVo = {
+/** 调课顶课(顶课:course_substitute 调课:course_exchange) */
+adjustType?: string;
 /** 班级名称（课表类型为teacher时使用） */
 className?: string;
 /** 教室名称（课表类型为class时使用） */
@@ -9838,6 +9842,117 @@ psychologicalFemaleCount?: number;
 psychologicalMaleCount?: number;
 }
 
+type HikvisionCarListVo = {
+/** 车牌号码 */
+plateNo?: string;
+}
+
+type HikvisionCarOutinPageVo = {
+/** 图片服务唯一标识 */
+aswSyscode?: string;
+/** 车辆分类 */
+carCategory?: string;
+/** 车辆分类名称 */
+carCategoryName?: string;
+/** 卡片号码 */
+cardNo?: string;
+/** 创建时间 */
+createTime?: string;
+/** 过车记录唯一标识 */
+crossRecordSyscode?: string;
+/** 通过时间 */
+crossTime?: string;
+/** 出入口名称 */
+entranceName?: string;
+/** 出入口唯一标识 */
+entranceSyscode?: string;
+/** 人脸图片uri */
+facePicUri?: string;
+/** 停车库名称 */
+parkName?: string;
+/** 停车库唯一标识 */
+parkSyscode?: string;
+/** 车牌颜色(0:蓝色,1:黄色,2:白色,3:黑色,4:绿色,5:民航黑色, 255:其他颜色) */
+plateColor?: number;
+/** 车牌号码 */
+plateNo?: string;
+/** 车牌图片uri */
+plateNoPicUri?: string;
+/** 车牌类型(0:标准民用车,1:02式民用车,3:警车,4:民用车双行尾牌车,5:使馆车,6:农用车,7:摩托车,8:新能源车) */
+plateType?: number;
+/** 放行模式(0-禁止放行，1-固定车包期，2-临时车入场，3-预约车入场，10-离线出场，11-缴费出场，12-预付费出场，13-免费出场，30- 非法卡不放行，31-手动放行，32-特殊车辆放行，33-节假日放行，35-群组放行，36-遥控器开闸) */
+releaseMode?: number;
+/** 放行原因(100-固定车自动放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行) */
+releaseReason?: number;
+/** 放行结果(0-未放行 1-正常放行 2-离线放行) */
+releaseResult?: number;
+/** 放行方式(10-未开闸 11-自动开闸 12-人工/人工开闸 13-遥控器开闸) */
+releaseWay?: number;
+/** 车道名称 */
+roadwayName?: string;
+/** 车道唯一标识 */
+roadwaySyscode?: string;
+/** 车辆颜色(0：其他颜色； 1：白色； 2：银色； 3：灰色； 4：黑色； 5：红色； 6：深蓝色； 7：蓝色； 8：黄色； 9：绿色； 10：棕色； 11：粉色； 12：紫色) */
+vehicleColor?: number;
+/** 是否出场(0-进场， 1-出场) */
+vehicleOut?: number;
+/** 车辆图片uri */
+vehiclePicUri?: string;
+/** 车辆类型(0：其他车； 1：小型车； 2：大型车； 3：摩托车) */
+vehicleType?: number;
+}
+
+type HikvisionOutinPageVo = {
+/** 卡号 */
+cardNo?: string;
+/** 证件号码 */
+certNo?: string;
+/** 控制器设备IndexCode */
+devIndexCode?: string;
+/** 控制器名称 */
+devName?: string;
+/** 门禁点编码 */
+doorIndexCode?: string;
+/** 门禁点名称 */
+doorName?: string;
+/** 门禁点所在区域编码 */
+doorRegionIndexCode?: string;
+/** 事件ID */
+eventId?: string;
+/** 事件名称 */
+eventName?: string;
+/** 事件产生时间 */
+eventTime?: string;
+/** 事件类型 */
+eventType?: string;
+/** 身份证图片uri */
+identityCardUri?: string;
+/** 进出类型(1：进 0：出 1:未知) */
+inAndOutType?: number;
+/** 工号 */
+jobNo?: string;
+/** 人员所属组织编码 */
+orgIndexCode?: string;
+/** 人员所属组织名称 */
+orgName?: string;
+/** 人员唯一编码 */
+personId?: string;
+/** 人员名称 */
+personName?: string;
+/** 抓拍图片地址 */
+picUri?: string;
+/** 读卡器IndexCode */
+readerDevIndexCode?: string;
+/** 读卡器名称 */
+readerDevName?: string;
+/** 事件入库时间 */
+receiveTime?: string;
+/** 学号 */
+studentId?: string;
+/** 图片存储服务的唯一标识 */
+svrIndexCode?: string;
+}
+
 type HistoryChangeDto = {
 id?: string;
 schemaId?: string;
@@ -10098,6 +10213,22 @@ id?: string;
 name?: string;
 }
 
+type LedgerCustomDeleteDto = {
+/** 台账数据id */
+id?: string;
+/** 表名称 */
+tableName?: string;
+}
+
+type LedgerCustomUpdateDto = {
+/** 表名称 */
+enabledMark?: number;
+/** 台账数据id */
+id?: string;
+/** 表名称 */
+tableName?: string;
+}
+
 type LedgerExportDataDto = {
 configIntoId?: string;
 queryParam?: any;
@@ -10990,6 +11121,8 @@ sortCode?: number;
 sourceAddress?: string;
 /** 来源 */
 sourceName?: string;
+/** 状态 1=未发布 2=已发布 3=下架 */
+status?: number;
 /** Tag词 */
 tagWord?: string;
 }
@@ -12082,6 +12215,22 @@ total?: number;
 totalPage?: number;
 }
 
+type PageOutput<HikvisionCarOutinPageVo> = {
+currentPage?: number;
+list?: HikvisionCarOutinPageVo[];
+pageSize?: number;
+total?: number;
+totalPage?: number;
+}
+
+type PageOutput<HikvisionOutinPageVo> = {
+currentPage?: number;
+list?: HikvisionOutinPageVo[];
+pageSize?: number;
+total?: number;
+totalPage?: number;
+}
+
 type PageOutput<HolidayDatePageVo> = {
 currentPage?: number;
 list?: HolidayDatePageVo[];
@@ -13184,7 +13333,11 @@ pbVXsxxsfytbPersonalList?: PbVXsxxsfytbPersonal[];
 }
 
 type PendingCountDto = {
+/** 我的传阅数量 */
+circulatedCount?: string;
+/** 我的申请数量 */
 myApplicationCount?: string;
+/** 流程待办数量 */
 wfPendingCount?: string;
 }
 

src/views/ledger/design/components/apiConfig.vue

@@ -10,21 +10,19 @@
     showFooter
   >
     <div class="full h-full">
-      <div style="height: 50px;">
+      <div style="height: 50px">
         <a-input v-model:value="url" placeholder="点击进行接口选择" @click="showApiConfig()">
           <template #suffix>
             <Icon icon="ant-design:ellipsis-outlined" />
           </template>
         </a-input>
       </div>
-      <div style="height: calc(100% - 50px);">
+      <div style="height: calc(100% - 50px)">
         <BasicTable @register="registerTable">
           <template #toolbar>
-            <a-button type="dashed" @click="addDetailRow()">
-              添加
-            </a-button>
+            <a-button type="dashed" @click="addDetailRow()"> 添加 </a-button>
           </template>
-          <template #bodyCell="{ column, record,index }">
+          <template #bodyCell="{ column, record, index }">
             <template v-if="column.key === 'action'">
               <TableAction
                 :actions="[
@@ -117,6 +115,8 @@
       setTimeout(() => {
         showApiConfig();
       }, 100);
+    } else {
+      state.apiInfo = { ...data.baseData.apiInfo };
     }
     modelRef.value = { ...data.baseData };
     url.value = data.baseData.apiInfo.path;

src/views/ledger/design/components/stepButtonConfig.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="h-full">
-    <div style="height: 50%;">
+    <div style="height: 50%">
       <BasicTable @register="registerTable">
-        <template #bodyCell="{ column, record,index }">
+        <template #bodyCell="{ column, record, index }">
           <template v-if="column.key === 'use'">
             <a-switch
               v-model:checked="record[column.key]"
@@ -19,9 +19,12 @@
         </template>
       </BasicTable>
     </div>
-    <div style="height: 50%;">
+    <div style="height: 50%">
       <BasicTable @register="registerTableItem">
-        <template #bodyCell="{ column, record ,index}">
+        <template #toolbar>
+          <div> 删除、作废 url 填表名</div>
+        </template>
+        <template #bodyCell="{ column, record, index }">
           <template v-if="column.key === 'use'">
             <a-switch
               v-model:checked="record[column.key]"

src/views/ledger/design/components/stepSearchConfig.vue

@@ -2,16 +2,14 @@
   <div class="h-full list-config">
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button type="dashed" @click="addDetailRow()">
-          添加
-        </a-button>
+        <a-button type="dashed" @click="addDetailRow()"> 添加 </a-button>
       </template>
       <template #headerCell="{ column }">
         <template v-if="column.key === 'sort'">
           <Icon size="14" icon="mingcute:move-line" />
         </template>
       </template>
-      <template #bodyCell="{ column, record,index }">
+      <template #bodyCell="{ column, record, index }">
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
@@ -26,7 +24,7 @@
 
         <template v-if="column.key === 'field'">
           <Select
-            style="width: 100%;"
+            style="width: 100%"
             v-model:value="record[column.key]"
             placeholder="请选择字段"
             show-search
@@ -42,7 +40,7 @@
         </template>
         <template v-if="column.key === 'component'">
           <Select
-            style="width: 100%;"
+            style="width: 100%"
             v-model:value="record[column.key]"
             placeholder="请控件类型"
             :options="fieldTypeList"
@@ -51,7 +49,7 @@
         <template v-if="column.key === 'bindObject'">
           <template v-if="record['component'] === 'ApiSelect'">
             <Select
-              style="width: 100%;"
+              style="width: 100%"
               v-model:value="record[column.key]"
               placeholder="绑定对象"
               show-search

src/views/ledger/design/edit.vue

@@ -14,7 +14,7 @@
   >
     <template #title>
       <div class="step-form-form">
-        <img src="/src/assets/images/logofull.svg" style="height: 120px;" />
+        <img src="/src/assets/images/logofull.svg" style="height: 120px" />
         <span>•</span>
         <span>台账配置</span>
         <a-steps :current="current" size="mini">
@@ -26,12 +26,8 @@
         </a-steps>
         <div class="btn-box">
           <a-button @click="handleStepPrev" v-show="current !== 0">上一步</a-button>
-          <a-button type="primary" @click="handleStepNext" v-show="current < 3">
-            下一步
-          </a-button>
-          <a-button type="primary" @click="handleSubmit" v-show="current === 3">
-            保存
-          </a-button>
+          <a-button type="primary" @click="handleStepNext" v-show="current < 3"> 下一步 </a-button>
+          <a-button type="primary" @click="handleSubmit" v-show="current === 3"> 保存 </a-button>
           <a-button type="primary" danger @click="handleClose">关闭</a-button>
         </div>
       </div>
@@ -89,6 +85,8 @@
       item: [
         { use: false, label: '查看', value: 'view', url: '' },
         { use: false, label: '附件预览', value: 'preview', url: '' },
+        { use: false, label: '删除', value: 'delete', url: '' },
+        { use: false, label: '作废', value: 'update', url: '' },
       ],
     },
   });
@@ -113,9 +111,13 @@
       ledgerConfig.tableFieldConfigs = configJson.tableFieldConfigs;
       ledgerConfig.columnConfigs = configJson.columnConfigs;
       ledgerConfig.serachConfigs = configJson.serachConfigs;
+
       ledgerConfig.buttonConfigs = cloneDeep(configJson.buttonConfigs);
-      stepListConfigRef?.value?.setTableData(ledgerConfig.columnConfigs);
-      stepSearchConfigRef?.value?.setTableData(ledgerConfig.serachConfigs);
+
+      setTimeout(() => {
+        stepListConfigRef?.value?.setTableData(ledgerConfig.columnConfigs);
+        stepSearchConfigRef?.value?.setTableData(ledgerConfig.serachConfigs);
+      }, 1000);
     }
 
     stepButtonConfigRef?.value?.setTableData(ledgerConfig.buttonConfigs);

src/views/ledger/template/index.vue

@@ -48,6 +48,10 @@
   import { getLedgerConfigReleaseConfigInto } from '/@/services/apis/LedgerConfigReleaseController';
   import { postLedgerExportExportQuery } from '/@/services/apis/LedgerExportController';
   import { getLedgeViewGetWorkflowInfo } from '/@/services/apis/LedgeViewController';
+  import {
+    deleteLedgerLedgerCustom,
+    putLedgerLedgerCustom,
+  } from '/@/services/apis/LedgerCustomController';
 
   const { currentRoute } = useRouter();
   const { setTitle } = useTabs();
@@ -128,7 +132,7 @@
 
     if (active) {
       columns.push({
-        width: 120,
+        width: 180,
         title: '操作',
         dataIndex: 'action',
         slots: { customRender: 'action' },
@@ -186,9 +190,14 @@
     const buttonConfigs = state.buttonConfigs.item.filter((item) => item.use === true);
     let actionsList: ActionItem[] = [];
     buttonConfigs.forEach((item) => {
+      let disabled = false;
+      if (item.value === 'update') {
+        disabled = record['delete_mark'] === 0;
+      }
       actionsList.push({
         tooltip: item.label,
         label: item.label,
+        disabled: disabled,
         onClick: btnEvent[item.value].bind(null, record, item.url),
       });
     });
@@ -218,6 +227,23 @@
     );
   };
 
+  const handelUpdate = async (record: any, url: string) => {
+    await putLedgerLedgerCustom({
+      enabledMark: 0,
+      tableName: url,
+      id: record.id,
+    });
+    reload();
+  };
+
+  const handelDelete = async (record: any, url: string) => {
+    await deleteLedgerLedgerCustom({
+      tableName: url,
+      id: record.id,
+    });
+    reload();
+  };
+
   const handleDownload = (record: any) => {
     const env = getAppEnvConfig();
     if (record.folderId) {
@@ -243,6 +269,8 @@
     export: handelExport,
     download: handleDownload,
     preview: handleView,
+    update: handelUpdate,
+    delete: handelDelete,
   };
 
   onMounted(async () => {