From 876b3800b4ef72cacafd0af7ca46303e83601c98 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Mon, 23 Mar 2026 12:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/biz/views/biz/myNotes/form.vue   | 46 +++++++++----------
 .../packages/biz/views/biz/myNotes/list.vue   | 18 ++++----
 .../biz/views/biz/myProjectInfo/form.vue      |  3 ++
 .../core/layouts/views/login/LoginForm.vue    |  4 +-
 web-vue/packages/core/locales/lang/en/sys.ts  |  2 +-
 5 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/web-vue/packages/biz/views/biz/myNotes/form.vue b/web-vue/packages/biz/views/biz/myNotes/form.vue
index 5983816..1261583 100644
--- a/web-vue/packages/biz/views/biz/myNotes/form.vue
+++ b/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('状态'),
-      field: 'ustatus',
-      component: 'Select',
-      componentProps: {
-        dictType: 'note_status',
-        allowClear: true,
-      },
-      required: true,
-    },
+	{
+	  label: t('便签类型'),
+	  field: 'type',
+	  component: 'Select',
+	  componentProps: {
+	    dictType: 'note_type',
+	    allowClear: 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>({
diff --git a/web-vue/packages/biz/views/biz/myNotes/list.vue b/web-vue/packages/biz/views/biz/myNotes/list.vue
index 6600ade..1a82a6d 100644
--- a/web-vue/packages/biz/views/biz/myNotes/list.vue
+++ b/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,
+	    },
+	  },
     ],
   };
 
diff --git a/web-vue/packages/biz/views/biz/myProjectInfo/form.vue b/web-vue/packages/biz/views/biz/myProjectInfo/form.vue
index 9972869..135ad7f 100644
--- a/web-vue/packages/biz/views/biz/myProjectInfo/form.vue
+++ b/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 });
   });
diff --git a/web-vue/packages/core/layouts/views/login/LoginForm.vue b/web-vue/packages/core/layouts/views/login/LoginForm.vue
index ceaa1ae..56649c2 100644
--- a/web-vue/packages/core/layouts/views/login/LoginForm.vue
+++ b/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>
+      <div class="font-size mb-5 text-center font-size-4 text-red"> </div>
       <FormItem name="account" class="enter-x">
         <Input
           size="large"
diff --git a/web-vue/packages/core/locales/lang/en/sys.ts b/web-vue/packages/core/locales/lang/en/sys.ts
index 1fbe485..f11efcd 100644
--- a/web-vue/packages/core/locales/lang/en/sys.ts
+++ b/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',