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

apps/web-antd/src/views/property/businessManagement/workOrdersType/index.vue

@@ -94,7 +94,6 @@ async function handleEdit(row: Required<WorkOrdersTypeForm>) {
 }
 
 async function handleDelete(row: Required<WorkOrdersTypeForm>) {
-  console.log(row,'======row')
   await workOrdersTypeRemove(row.id);
   await tableApi.query();
 }
@@ -160,7 +159,7 @@ function handleMultiDelete() {
               danger
               v-access:code="['property:workOrdersType:remove']"
               @click.stop=""
-              :disabled="row.children?.length>0"
+              :disabled="row.children?.length>0||row.id=='1943128289816682498'||row.id=='1952989217332658178'"
             >
               {{ $t('pages.common.delete') }}
             </ghost-button>

apps/web-antd/src/views/property/clean/cleanSettings/data.ts

@@ -174,6 +174,13 @@ export const modalSchema: FormSchemaGetter = () => [
   //   },
   //   rules: 'required',
   // },
+  {
+    label: '保洁内容',
+    fieldName: 'cleanContent',
+    component: 'Textarea',
+    rules: 'required',
+    formItemClass: 'col-span-2',
+  },
   {
     label: '状态',
     fieldName: 'stater',

apps/web-antd/src/views/screen/property/analytics-trends.vue

@@ -53,7 +53,6 @@ const getMeterRecordTrend = async (selectedDate: any) => {
     },
     series: [
       {
-        areaStyle: {},
         data: seriesData,
         itemStyle: {
           color: '#3ec6ff',