Merge branch 'ft-dev' into 'main'

fix:修复租户管理员新增账号问题，fix：修复未分配首页，地址栏输入/#/重定向404问题，feat:新增设备页面的设备名字跳转到设备配置页面，并且高亮当前行

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

@@ -4,6 +4,8 @@ import { mainOutRoutes } from './mainOut';
 import { PageEnum } from '/@/enums/pageEnum';
 import { PageEnum } from '/@/enums/pageEnum';
 import { t } from '/@/hooks/web/useI18n';
 import { t } from '/@/hooks/web/useI18n';
 import { LAYOUT } from '../constant';
 import { LAYOUT } from '../constant';
+import { getMenuList } from '/@/api/sys/menu';
+import { router } from '/@/router';
 
 
 const modules = import.meta.globEager('./modules/**/*.ts');
 const modules = import.meta.globEager('./modules/**/*.ts');
 const routeModuleList: AppRouteModule[] = [];
 const routeModuleList: AppRouteModule[] = [];
@@ -12,6 +14,41 @@ Object.keys(modules).forEach((key) => {
   const modList = Array.isArray(mod) ? [...mod] : [mod];
   const modList = Array.isArray(mod) ? [...mod] : [mod];
   routeModuleList.push(...modList);
   routeModuleList.push(...modList);
 });
 });
+let pushPath = '';
+let pushSubPath = '';
+
+async function hashChangeFunc() {
+  const getMenuListData1 = window.localStorage.getItem('menuListStorage') || (await getMenuList());
+  const getMenuListData = JSON.parse(getMenuListData1);
+  const getHomePage = getMenuListData.find((f) => {
+    return f.path == '/dashboard/workbench';
+  });
+  if (getHomePage?.path == '/dashboard/workbench') {
+    setTimeout(() => {
+      router.push('/dashboard/workbench');
+    }, 200);
+  } else {
+    const routeF = getMenuListData[0]?.children[0]?.path || getMenuListData[0].path;
+    pushPath = routeF;
+    pushSubPath = pushPath.substring(1);
+  }
+}
+hashChangeFunc();
+
+window.onhashchange = (e) => {
+  console.log(e);
+  setTimeout(() => {
+    if (
+      e.newURL == 'http://localhost:8083/#/' ||
+      e.newURL == 'http://localhost:8083/#' ||
+      e.newURL == 'http://localhost:8083/' ||
+      e.newURL == 'http://localhost:8083'
+    ) {
+      window.location.href = e.newURL + pushSubPath;
+    }
+  }, 1000);
+};
+
 export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, ...routeModuleList];
 export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, ...routeModuleList];
 export const RootRoute: AppRouteRecordRaw = {
 export const RootRoute: AppRouteRecordRaw = {
   path: '/',
   path: '/',

@@ -11,7 +11,7 @@
           <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> 新增设备 </a-button>
           <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> 新增设备 </a-button>
         </template>
         </template>
         <template #deviceProfile="{ record }">
         <template #deviceProfile="{ record }">
-          <a-button type="link" class="ml-2" @click="goDeviceProfile">
+          <a-button type="link" class="ml-2" @click="goDeviceProfile(record.deviceProfile.name)">
             {{ record.deviceProfile.name }}
             {{ record.deviceProfile.name }}
           </a-button>
           </a-button>
         </template>
         </template>
@@ -213,8 +213,8 @@
         searchInfo.organizationId = organization;
         searchInfo.organizationId = organization;
         handleSuccess();
         handleSuccess();
       }
       }
-      function goDeviceProfile() {
-        go(PageEnum.DEVICE_PROFILE);
+      function goDeviceProfile(e) {
+        go(PageEnum.DEVICE_PROFILE + '?name=' + String(e));
       }
       }
 
 
       return {
       return {

 <template>
 <template>
   <div>
   <div>
     <BasicTable
     <BasicTable
+      class="devide-profile"
       @selection-change="useSelectionChange"
       @selection-change="useSelectionChange"
       @register="registerTable"
       @register="registerTable"
       :rowSelection="{ type: 'checkbox' }"
       :rowSelection="{ type: 'checkbox' }"
+      :rowClassName="setRowClassName"
     >
     >
       <template #toolbar>
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button>
         <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button>
@@ -66,6 +68,8 @@
     setup() {
     setup() {
       let selectedRowKeys: string[] = reactive([]);
       let selectedRowKeys: string[] = reactive([]);
       let isJudgeStatus = ref(true);
       let isJudgeStatus = ref(true);
+      const getPathUrl = ref('');
+      const getPathUrlName = ref('');
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
       const [registerModalDetail, { openModal: openModalDetail }] = useModal();
       const [registerModalDetail, { openModal: openModalDetail }] = useModal();
@@ -92,6 +96,32 @@
         },
         },
       });
       });
 
 
+      /**
+       *@param url,name
+       **/
+      function getParam(url, name) {
+        try {
+          let reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+          let r = url.split('?')[1].match(reg);
+          if (r != null) {
+            return r[2];
+          }
+          return ''; //如果此处只写return;则返回的是undefined
+        } catch (e) {
+          return ''; //如果此处只写return;则返回的是undefined
+        }
+      }
+      getPathUrl.value = window.location.href;
+      const name = 'name';
+      const getName = getParam(getPathUrl.value, name);
+      getPathUrlName.value = decodeURIComponent(getName);
+
+      const setRowClassName = (record) => {
+        if (record.name === getPathUrlName.value) {
+          return 'rowcolor2';
+        }
+      };
+
       const tableListRef = ref<
       const tableListRef = ref<
         {
         {
           title: string;
           title: string;
@@ -181,6 +211,7 @@
         reload();
         reload();
       }
       }
       return {
       return {
+        setRowClassName,
         registerModalDetail,
         registerModalDetail,
         // register1,
         // register1,
         // defaultHeader,
         // defaultHeader,
@@ -202,3 +233,12 @@
     },
     },
   });
   });
 </script>
 </script>
+
+<style lang="css">
+  .devide-profile .rowcolor {
+    color: red;
+  }
+  .devide-profile .rowcolor2 {
+    background: #a2c3e6;
+  }
+</style>

@@ -43,17 +43,20 @@
         },
         },
         {
         {
           field: 'username',
           field: 'username',
-          required: true,
           label: '账号',
           label: '账号',
           component: 'Input',
           component: 'Input',
           componentProps: {
           componentProps: {
             maxLength: 255,
             maxLength: 255,
             placeholder: '请输入账号',
             placeholder: '请输入账号',
           },
           },
-          dynamicRules: () => {
+          dynamicRules: ({ values }) => {
+            const findUserName = isJudgeUserNameExist.value.find((f) => {
+              if (f) {
+                return f.username == values.username;
+              }
+            });
             return [
             return [
               {
               {
-                required: true,
                 validator(_, value) {
                 validator(_, value) {
                   return new Promise((resolve, reject) => {
                   return new Promise((resolve, reject) => {
                     if (value == '') {
                     if (value == '') {
@@ -62,19 +65,10 @@
                       reject('账号不能含有中文');
                       reject('账号不能含有中文');
                     } else if (EmailRegexp.test(value)) {
                     } else if (EmailRegexp.test(value)) {
                       reject('账号不能为电子邮箱格式');
                       reject('账号不能为电子邮箱格式');
+                    } else if (value == findUserName?.username) {
+                      reject('账号已存在');
+                      return;
                     } else {
                     } else {
-                      try {
-                        const findUserName = isJudgeUserNameExist.value.find((f) => {
-                          return f.username == value;
-                        });
-                        if (value == findUserName?.username) {
-                          reject('账号已存在');
-                        } else {
-                          reject('请输入');
-                        }
-                      } catch (e) {
-                        return reject(e);
-                      }
                       resolve();
                       resolve();
                     }
                     }
                   });
                   });