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

apps/web-antd/src/api/cockpit/cockpit.ts

@@ -0,0 +1,48 @@
+
+import { requestClient } from '#/api/request';
+
+/**
+ * 大屏接口
+ */
+
+/**
+ * 访客
+ */
+export function visitir() {
+  return requestClient.get('/property/cockpit/visitor');
+}
+
+/**
+ *费用
+ */
+export function expenses() {
+  return requestClient.get('/property/cockpit/expenses');
+}
+
+/**
+ * 物业人员配置
+ */
+export function propertyPerson() {
+  return requestClient.get('/property/cockpit/propertyperson');
+}
+
+/**
+ * sos报警
+ */
+export function sos() {
+  return requestClient.get('/property/cockpit/sos');
+}
+
+/**
+ * sos报警记录
+ */
+export function soslist() {
+  return requestClient.get('/property/cockpit/soslist');
+}
+
+/**
+ * 工单
+ */
+export function workcount() {
+  return requestClient.get('/property/cockpit/workcount');
+}

apps/web-antd/src/api/property/customerService/questionnaire/question/model.d.ts

@@ -1,4 +1,7 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
+import type {
+  QuestionItemForm
+} from "#/api/property/customerService/questionnaire/questionItem/model";
 
 export interface QuestionVO {
   /**
@@ -57,7 +60,7 @@ export interface QuestionForm extends BaseEntity {
   /**
    * 问题类型(1单行文本2多行文本3单选题4多选题5评分题6日期选择)
    */
-  type?: string;
+  type: string;
 
   /**
    * 是否必填(1不必填2必填)
@@ -74,6 +77,21 @@ export interface QuestionForm extends BaseEntity {
    */
   sort?: number;
 
+  /**
+   * 选项
+   */
+  questionnaireQuestionItems:QuestionItemForm[]
+
+  /**
+   * 评分预览
+   */
+  rate?:number;
+
+  /**
+   * 时间预览
+   */
+  dateTime?:string;
+
 }
 
 export interface QuestionQuery extends PageQuery {

apps/web-antd/src/api/property/customerService/questionnaire/questionnaire/model.d.ts

@@ -1,4 +1,5 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
+import type {QuestionForm} from "#/api/property/customerService/questionnaire/question/model";
 
 export interface QuestionnaireVO {
   /**
@@ -74,6 +75,11 @@ export interface QuestionnaireForm extends BaseEntity {
    */
   status?: string;
 
+  /**
+   * 问题
+   */
+  questionnaireQuestions:QuestionForm[];
+
 }
 
 export interface QuestionnaireQuery extends PageQuery {