Merge branch 'sqy_dev' into 'main'

'fix:重置密码,修复各种各样问题'

See merge request huang/yun-teng-iot-front!152

@@ -8,14 +8,14 @@ VITE_PUBLIC_PATH = /
 # Please note that no line breaks
 
 # 本地
-# VITE_PROXY = [["/api","http://192.168.10.108:8080/api"]]
+# VITE_PROXY = [["/api","http://192.168.10.113:8080/api"]]
 
 # 线上
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 VITE_PROXY = [["/api","http://47.99.141.212:8080/api"]]
 
 # 实时数据的ws地址
-VITE_WEB_SOCKET = ws://101.133.234.90:8080/api/ws/plugins/telemetry?token=
+VITE_WEB_SOCKET = ws://47.99.141.212:8080/api/ws/plugins/telemetry?token=
 
 # Delete console
 VITE_DROP_CONSOLE = true

@@ -8,7 +8,7 @@ import {
   SmsLoginParams,
 } from './model/userModel';
 
-import { ErrorMessageMode } from '/#/axios';
+import type { ErrorMessageMode } from '/#/axios';
 
 enum Api {
   Login = '/auth/login',
@@ -19,6 +19,8 @@ enum Api {
   GetPermCode = '/role/me/permissions',
   RefreshToken = '/auth/token',
   SendLoginSmsCode = '/noauth/sendLoginSmsCode/',
+  ResetCode = '/noauth/resetCode/',
+  ResetPassword = '/noauth/reset/',
 }
 
 /**
@@ -78,9 +80,17 @@ export function smsCodeLoginApi(params: SmsLoginParams, mode: ErrorMessageMode =
   );
 }
 
-export function forgetPasswordApi(params) {
+// 密码重置验证码
+export function passwordResetCode(mobile) {
   return defHttp.post({
-    url: '',
-    params,
+    url: Api.ResetCode + mobile,
+  });
+}
+
+// 重置密码
+export function forgetPasswordApi(data) {
+  return defHttp.post({
+    url: Api.ResetPassword + data.phoneNumber,
+    data,
   });
 }

@@ -45,6 +45,7 @@
       const lockStore = useLockStore();
 
       const getRealName = computed(() => userStore.getUserInfo?.realName);
+      console.log(getRealName);
       const [register, { closeModal }] = useModalInner();
 
       const [registerForm, { validateFields, resetFields }] = useForm({
@@ -95,7 +96,7 @@
     &__entry {
       position: relative;
       //height: 240px;
-      padding: 130px 30px 30px 30px;
+      padding: 130px 30px 30px;
       border-radius: 10px;
     }
 
@@ -105,7 +106,6 @@
       left: calc(50% - 45px);
       width: auto;
       text-align: center;
-
       &-img {
         width: 70px;
         border-radius: 50%;
@@ -113,6 +113,9 @@
 
       &-name {
         margin-top: 5px;
+        display: flex;
+        width: 100%;
+        // margin-left: -15px;
       }
     }
 

@@ -85,6 +85,7 @@
   import { getAuthCache } from '/@/utils/auth';
   import { Upload } from 'ant-design-vue';
   import { PlusOutlined } from '@ant-design/icons-vue';
+  import { useUserStore } from '/@/store/modules/user';
   import type { FileItem } from '/@/components/Upload/src/typing';
 
   const schema: DescItem[] = [
@@ -126,6 +127,7 @@
       const getBackendV: any = ref({});
       const getData: any = ref({});
       const updataPersonlData: any = ref({});
+      const userStore = useUserStore();
       // const getUpdateUserInfo: any = ref({});
       const [registerDesc] = useDescription({
         title: '个人详情',
@@ -209,6 +211,8 @@
         getPersonalValue.value.username = getBackendV.value.username;
         getPersonalValue.value.avatar = peresonalPic.value;
         getData.value = await personalPut(getPersonalValue.value);
+        console.log(getData.value.realName);
+        userStore.setUserInfo(getData.value);
         updatePersonalData.value = getData.value;
         createMessage.success('修改成功');
         const setUpdateUserInfo = JSON.stringify(getData.value);

@@ -56,7 +56,7 @@ export default {
     alert: '锁屏密码错误',
     backToLogin: '返回登录',
     entry: '进入系统',
-    placeholder: '请输入锁屏密码或者用户密码',
+    placeholder: '请输入锁屏密码或者重新登录',
   },
   login: {
     backSignIn: '返回',

@@ -31,29 +31,10 @@ export const useLockStore = defineStore({
     },
     // Unlock
     async unLock(password?: string) {
-      const userStore = useUserStore();
       if (this.lockInfo?.pwd === password) {
         this.resetLockInfo();
         return true;
       }
-      const tryLogin = async () => {
-        try {
-          const username = userStore.getUserInfo?.username;
-          const res = await userStore.login({
-            username,
-            password: password!,
-            goHome: false,
-            mode: 'none',
-          });
-          if (res) {
-            this.resetLockInfo();
-          }
-          return res;
-        } catch (error) {
-          return false;
-        }
-      };
-      return await tryLogin();
     },
   },
 });

@@ -4,13 +4,7 @@ import { defineStore } from 'pinia';
 import { store } from '/@/store';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { PageEnum } from '/@/enums/pageEnum';
-import {
-  JWT_TOKEN_KEY,
-  REFRESH_TOKEN_KEY,
-  ROLES_KEY,
-  TOKEN_KEY,
-  USER_INFO_KEY,
-} from '/@/enums/cacheEnum';
+import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import {
   LoginParams,

@@ -71,7 +71,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       placeholder: '请输入联系人姓名',
-      maxLength: 255,
+      maxLength: 30,
     },
   },
   {

@@ -6,11 +6,6 @@ import { numberRule } from '/@/utils/rules';
 
 export const columns: BasicColumn[] = [
   {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 150,
-  },
-  {
     title: '名称',
     dataIndex: 'name',
     width: 150,
@@ -26,10 +21,21 @@ export const columns: BasicColumn[] = [
     width: 100,
   },
   {
+    title: '默认配置',
+    dataIndex: 'default',
+    width: 100,
+    format: (text) => (text ? '是' : '否'),
+  },
+  {
     title: '描述',
     dataIndex: 'description',
     width: 150,
   },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 150,
+  },
 ];
 
 export const searchFormSchema: FormSchema[] = [

@@ -22,6 +22,9 @@
               label: '设置为默认',
               icon: 'ant-design:profile-outlined',
               onClick: handleSetDefault.bind(null, record),
+              ifShow: () => {
+                return record.default === false;
+              },
             },
             {
               label: '详情',
@@ -102,7 +105,7 @@
         bordered: true,
         showIndexColumn: false,
         actionColumn: {
-          width: 200,
+          width: 250,
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },

@@ -33,14 +33,6 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '内容',
-    dataIndex: 'content',
-    width: 120,
-    format: (text: string, record: Recordable) => {
-      return !record.content ? '' : record.content.slice(3, record.content.length - 4);
-    },
-  },
-  {
     title: '发送者',
     dataIndex: 'senderName',
     width: 200,

@@ -5,23 +5,7 @@
   >
     <div
       :class="`${prefixCls}__unlock`"
-      class="
-        absolute
-        top-0
-        left-1/2
-        flex
-        pt-5
-        h-16
-        items-center
-        justify-center
-        sm:text-md
-        xl:text-xl
-        text-white
-        flex-col
-        cursor-pointer
-        transform
-        translate-x-1/2
-      "
+      class="absolute top-0 left-1/2 flex pt-5 h-16 items-center justify-center sm:text-md xl:text-xl text-white flex-col cursor-pointer transform translate-x-1/2"
       @click="handleShowForm(false)"
       v-show="showDate"
     >
@@ -140,7 +124,7 @@
   }
 
   function goLogin() {
-    userStore.logout();
+    userStore.logout(true);
     lockStore.resetLockInfo();
   }
 

@@ -40,7 +40,7 @@
   import { CountdownInput } from '/@/components/CountDown';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useLoginState, useFormRules, LoginStateEnum } from './useLogin';
-  import { forgetPasswordApi } from '/@/api/sys/user';
+  import { passwordResetCode, forgetPasswordApi } from '/@/api/sys/user';
   const FormItem = Form.Item;
   const { t } = useI18n();
   const { handleBackLogin, getLoginState, setLoginState } = useLoginState();
@@ -58,22 +58,39 @@
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.RESET_PASSWORD);
 
   async function handleReset() {
-    setLoginState(LoginStateEnum.LOGIN);
     const form = unref(formRef);
     if (!form) return;
+    const value = await form.validate();
+    if (!value) return;
+    const { mobile, password, sms } = value;
+    try {
+      loading.value = true;
+      await forgetPasswordApi({
+        phoneNumber: mobile,
+        userId: sms,
+        password,
+      });
+    } catch (e) {
+      return;
+    } finally {
+      loading.value = false;
+    }
+    message.success('密码重置成功');
     await form.resetFields();
+    setLoginState(LoginStateEnum.LOGIN);
   }
 
   async function sendLoginSms() {
     const reg =
       /^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$/;
     if (reg.test(formData.mobile)) {
-      const sendRes = await forgetPasswordApi(formData.mobile);
-      if (!sendRes) {
-        message.error('发送失败');
-        return false;
+      const sendRes = await passwordResetCode(formData.mobile);
+      console.log(sendRes);
+      if (sendRes === '') {
+        console.log('发送成功了');
+        return true;
       }
-      return true;
+      return false;
     } else {
       message.error('请输入正确手机号码');
     }

@@ -60,10 +60,16 @@
       </ACol>
     </ARow>
   </Form>
+  <Modal v-model:visible="visible" :footer="null" centered>
+    <template #title>
+      <CloseCircleFilled class="modal-icon-error" /><span class="ml-2">错误提示</span>
+    </template>
+    <span class="ml-2" style="color: red">用户名或密码不正确</span>
+  </Modal>
 </template>
 <script lang="ts" setup>
   import { reactive, ref, unref, computed } from 'vue';
-  import { Checkbox, Form, Input, Row, Col, Button } from 'ant-design-vue';
+  import { Checkbox, Form, Input, Row, Col, Button, Modal } from 'ant-design-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
 
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -74,6 +80,7 @@
   import { useDesign } from '/@/hooks/web/useDesign';
   import { getPlatForm } from '/@/api/oem/index';
   import { createLocalStorage } from '/@/utils/cache/index';
+  import { CloseCircleFilled } from '@ant-design/icons-vue';
 
   const ACol = Col;
   const ARow = Row;
@@ -87,7 +94,7 @@
   const { setLoginState, getLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
   const storage = createLocalStorage();
-
+  const visible = ref(false);
   const formRef = ref();
   const loading = ref(false);
   const rememberMe = ref(false);
@@ -100,6 +107,7 @@
   const { validForm } = useFormValid(formRef);
 
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN);
+
   async function handleLogin() {
     const data = await validForm();
     if (!data) return;
@@ -113,7 +121,7 @@
       const userInfo = await userStore.login({
         password: data.password,
         username: data.account,
-        mode: 'none', //不要默认的错误提示
+        mode: 'modal', //不要默认的错误提示
       });
       if (userInfo) {
         notification.success({
@@ -132,12 +140,8 @@
         link.href = res.icon ?? '/favicon.ico';
         document.getElementsByTagName('head')[0].appendChild(link);
       }
-    } catch (error) {
-      createErrorModal({
-        title: t('sys.api.errorTip'),
-        content: (error as unknown as Error).message || t('sys.api.networkExceptionMsg'),
-        getContainer: () => document.body.querySelector(`.${prefixCls}`) || document.body,
-      });
+    } catch (error: any) {
+      visible.value = true;
     } finally {
       loading.value = false;
     }

@@ -78,6 +78,7 @@
   async function handleLogin() {
     const data = await validForm();
     if (!data) return;
+
     const userInfo = await userStore.smsCodelogin(
       toRaw({
         phoneNumber: data.phoneNumber,

@@ -10,23 +10,11 @@ export const schemas: FormSchema[] = [
     colProps: {
       span: 24,
     },
+    required: true,
     componentProps: {
       maxLength: 100,
       placeholder: '请输入公司名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 100) {
-              return Promise.reject('字数不超过100个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'abbreviation',
@@ -148,23 +136,11 @@ export const schemas: FormSchema[] = [
     colProps: {
       span: 24,
     },
+    required: true,
     componentProps: {
       maxLength: 100,
       placeholder: '请输入详细地址',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 100) {
-              return Promise.reject('字数不超过100个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 
   {
@@ -174,23 +150,11 @@ export const schemas: FormSchema[] = [
     colProps: {
       span: 24,
     },
+    required: true,
     componentProps: {
       maxLength: 25,
       placeholder: '请输入联系人',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 25) {
-              return Promise.reject('字数不超过25个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'tel',

@@ -3,15 +3,15 @@
     <Card class="tab-card" :bordered="false">
       <Tabs v-model:activeKey="activeKey" tab-position="left">
         <Tabs.TabPane key="企业信息" tab="企业信息" />
-        <Tabs.TabPane key="平台定制" tab="平台定制" />
-        <Tabs.TabPane key="APP定制" tab="APP定制" />
+        <Tabs.TabPane key="平台信息" tab="平台信息" />
+        <Tabs.TabPane key="APP信息" tab="APP信息" />
       </Tabs>
     </Card>
 
     <div style="width: 100%">
       <Card class="card" :title="activeKey" :bordered="false" :bodyStyle="{ display: 'none' }" />
       <EnterpriseInfo v-if="activeKey === '企业信息'" />
-      <CVIDraw v-else-if="activeKey === '平台定制'" />
+      <CVIDraw v-else-if="activeKey === '平台信息'" />
       <AppDraw v-else />
     </div>
   </div>