项目初始化

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

@@ -54,7 +54,7 @@
       colProps: { md: 24, lg: 24 },
     },
     {
-      label: t('标题'),
+      label: t('便签标题'),
       field: 'title',
       component: 'Input',
       componentProps: {
@@ -64,14 +64,14 @@
       colProps: { md: 24, lg: 24 },
     },
     {
-      label: t('内容'),
+      label: t('便签内容'),
       field: 'content',
       component: 'InputTextArea',
       required: true,
       colProps: { md: 24, lg: 24 },
     },
     {
-      label: t('级别'),
+      label: t('便签级别'),
       field: 'priority',
       component: 'Select',
       componentProps: {
@@ -80,16 +80,16 @@
       },
       required: true,
     },
-    {
+	{
-      label: t('状态'),
+	  label: t('便签类型'),
-      field: 'ustatus',
+	  field: 'type',
-      component: 'Select',
+	  component: 'Select',
-      componentProps: {
+	  componentProps: {
-        dictType: 'note_status',
+	    dictType: 'note_type',
-        allowClear: true,
+	    allowClear: true,
-      },
+	  },
-      required: true,
+	  required: true,
-    },
+	},
     {
       label: t('开始时间'),
       field: 'startTime',
@@ -108,16 +108,6 @@
         showTime: { format: 'HH:mm' },
       },
     },
-    {
-      label: t('便签类型'),
-      field: 'type',
-      component: 'Select',
-      componentProps: {
-        dictType: 'note_type',
-        allowClear: true,
-      },
-      required: true,
-    },
     {
       label: t('截至时间'),
       field: 'deadline',
@@ -128,6 +118,16 @@
       },
       required: true,
     },
+	{
+	  label: t('便签状态'),
+	  field: 'ustatus',
+	  component: 'Select',
+	  componentProps: {
+	    dictType: 'note_status',
+	    allowClear: true,
+	  },
+	  required: true,
+	},
   ];
 
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<MyNotes>({

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

@@ -100,15 +100,6 @@
           allowClear: true,
         },
       },
-      {
-        label: t('状态'),
-        field: 'ustatus',
-        component: 'Select',
-        componentProps: {
-          dictType: 'note_status',
-          allowClear: true,
-        },
-      },
       {
         label: t('类型'),
         field: 'type',
@@ -118,6 +109,15 @@
           allowClear: true,
         },
       },
+	  {
+	    label: t('状态'),
+	    field: 'ustatus',
+	    component: 'Select',
+	    componentProps: {
+	      dictType: 'note_status',
+	      allowClear: true,
+	    },
+	  },
     ],
   };
 

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

@@ -203,6 +203,9 @@
     const res = await myProjectInfoForm(data);
     record.value = (res.myProjectInfo || {}) as MyProjectInfo;
     record.value.__t = new Date().getTime();
+	if (record.value.areaLevel) {
+		areaListParams.value.areaLevel = record.value.areaLevel;
+	}
     await setFieldsValue(record.value);
     setDrawerProps({ loading: false });
   });

web-vue/packages/core/layouts/views/login/LoginForm.vue

@@ -1,8 +1,8 @@
 <template>
   <div v-if="getShow">
+    <LoginFormTitle class="enter-x" />
     <Form class="enter-x p-4" :model="formData" :rules="getFormRules" ref="formRef" @keypress.enter="handleLogin">
-      <div class="font-size mb-5 text-center font-size-4 text-red">
+      <div class="font-size mb-5 text-center font-size-4 text-red"> </div>
-      </div>
       <FormItem name="account" class="enter-x">
         <Input
           size="large"

web-vue/packages/core/locales/lang/en/sys.ts

@@ -57,7 +57,7 @@ export default {
     subTitle500: 'Sorry, the server is reporting an error.',
     noDataTitle: 'No data on the current page.',
     networkErrorTitle: 'Network Error',
-    networkErrorSubTitle: 'Sorry，Your network connection has been disconnected, please check your network!',
+    networkErrorSubTitle: 'Sorry network connection has been disconnected, please check your network!',
   },
   lock: {
     unlock: 'Click to unlock',