fix:修改密码和角色回显 feat:新增场景联动接口，待联调 wip:开发场景联动中

 import { BasicPageParams } from '/@/api/model/baseModel';
 
-export type ScreenLinkPageTableQueryParam = BasicPageParams;
-export interface ScreenModel {
-  name: string;
-  act: number;
-  stu: number;
-  desc: string;
-  createTime: string;
+export type ScreenLinkPageTableQueryParam = BasicPageParams & ScreenParam;
+
+export type ScreenParam = {
+  name?: string;
+  other?: string;
+};
+export interface ScreenAddModel {
+  createTime?: '2021-11-29T09:13:38.810Z';
+  creator?: 'string';
+  defaultConfig?: 'string';
+  description?: 'string';
+  doAction?: [
+    {
+      command: 'string';
+      createTime: '2021-11-29T09:13:38.810Z';
+      creator: 'string';
+      defaultConfig: 'string';
+      description: 'string';
+      deviceId: 'string';
+      enabled: true;
+      icon: 'string';
+      id: 'string';
+      name: 'string';
+      outPut: 'string';
+      outTarget: 'string';
+      roleIds: ['string'];
+      tenantCode: 'string';
+      tenantExpireTime: '2021-11-29T09:13:38.811Z';
+      tenantId: 'string';
+      tenantStatus: 'DISABLED';
+      updateTime: '2021-11-29T09:13:38.811Z';
+      updater: 'string';
+    }
+  ];
+  doCondition?: [
+    {
+      compare: 0;
+      createTime: '2021-11-29T09:13:38.811Z';
+      creator: 'string';
+      defaultConfig: 'string';
+      description: 'string';
+      deviceId: 'string';
+      enabled: true;
+      icon: 'string';
+      id: 'string';
+      name: 'string';
+      property: 'string';
+      roleIds: ['string'];
+      status: 'string';
+      tenantCode: 'string';
+      tenantExpireTime: '2021-11-29T09:13:38.811Z';
+      tenantId: 'string';
+      tenantStatus: 'DISABLED';
+      updateTime: '2021-11-29T09:13:38.811Z';
+      updater: 'string';
+      value: 'string';
+    }
+  ];
+  enabled?: true;
+  icon?: 'string';
+  id?: 'string';
+  name?: 'string';
+  organizationId?: 'string';
+  roleIds?: ['string'];
+  status?: 'string';
+  tenantCode?: 'string';
+  tenantExpireTime?: '2021-11-29T09:13:38.811Z';
+  tenantId?: 'string';
+  tenantStatus?: 'DISABLED';
+  triggers?: [
+    {
+      attributeChoose: 'string';
+      compare: 0;
+      createTime: '2021-11-29T09:13:38.811Z';
+      creator: 'string';
+      defaultConfig: 'string';
+      description: 'string';
+      deviceId: 'string';
+      enabled: true;
+      icon: 'string';
+      id: 'string';
+      name: 'string';
+      roleIds: ['string'];
+      tenantCode: 'string';
+      tenantExpireTime: '2021-11-29T09:13:38.811Z';
+      tenantId: 'string';
+      tenantStatus: 'DISABLED';
+      tiggerEvent: 'string';
+      touchWay: 'string';
+      updateTime: '2021-11-29T09:13:38.811Z';
+      updater: 'string';
+      value: 'string';
+    }
+  ];
+  updateTime?: '2021-11-29T09:13:38.811Z';
+  updater?: 'string';
+}
+
+export interface ScreenUpdateModel {
+  createTime?: '2021-11-29T09:13:38.810Z';
+  creator?: 'string';
+  defaultConfig?: 'string';
+  description?: 'string';
+  doAction?: [
+    {
+      command: 'string';
+      createTime: '2021-11-29T09:13:38.810Z';
+      creator: 'string';
+      defaultConfig: 'string';
+      description: 'string';
+      deviceId: 'string';
+      enabled: true;
+      icon: 'string';
+      id: 'string';
+      name: 'string';
+      outPut: 'string';
+      outTarget: 'string';
+      roleIds: ['string'];
+      tenantCode: 'string';
+      tenantExpireTime: '2021-11-29T09:13:38.811Z';
+      tenantId: 'string';
+      tenantStatus: 'DISABLED';
+      updateTime: '2021-11-29T09:13:38.811Z';
+      updater: 'string';
+    }
+  ];
+  doCondition?: [
+    {
+      compare: 0;
+      createTime: '2021-11-29T09:13:38.811Z';
+      creator: 'string';
+      defaultConfig: 'string';
+      description: 'string';
+      deviceId: 'string';
+      enabled: true;
+      icon: 'string';
+      id: 'string';
+      name: 'string';
+      property: 'string';
+      roleIds: ['string'];
+      status: 'string';
+      tenantCode: 'string';
+      tenantExpireTime: '2021-11-29T09:13:38.811Z';
+      tenantId: 'string';
+      tenantStatus: 'DISABLED';
+      updateTime: '2021-11-29T09:13:38.811Z';
+      updater: 'string';
+      value: 'string';
+    }
+  ];
+  enabled?: true;
+  icon?: 'string';
+  id?: 'string';
+  name?: 'string';
+  organizationId?: 'string';
+  roleIds?: ['string'];
+  status?: 'string';
+  tenantCode?: 'string';
+  tenantExpireTime?: '2021-11-29T09:13:38.811Z';
+  tenantId?: 'string';
+  tenantStatus?: 'DISABLED';
+  triggers?: [
+    {
+      attributeChoose: 'string';
+      compare: 0;
+      createTime: '2021-11-29T09:13:38.811Z';
+      creator: 'string';
+      defaultConfig: 'string';
+      description: 'string';
+      deviceId: 'string';
+      enabled: true;
+      icon: 'string';
+      id: 'string';
+      name: 'string';
+      roleIds: ['string'];
+      tenantCode: 'string';
+      tenantExpireTime: '2021-11-29T09:13:38.811Z';
+      tenantId: 'string';
+      tenantStatus: 'DISABLED';
+      tiggerEvent: 'string';
+      touchWay: 'string';
+      updateTime: '2021-11-29T09:13:38.811Z';
+      updater: 'string';
+      value: 'string';
+    }
+  ];
+  updateTime?: '2021-11-29T09:13:38.811Z';
+  updater?: 'string';
 }

 import { defHttp } from '/@/utils/http/axios';
-import { ScreenLinkPageTableQueryParam } from '/@/api/ruleengine/model/ruleengineModel';
+import {
+  ScreenLinkPageTableQueryParam,
+  ScreenAddModel,
+  ScreenUpdateModel,
+} from '/@/api/ruleengine/model/ruleengineModel';
 
 enum ScreenManagerApi {
   /**
    * 场景URL
    */
-  SCREEN_URL = '/getTable',
+  SCREEN_GET_URL = '/sceneLinkage',
+  SCREEN_ADD_URL = '/sceneLinkage',
+  SCREEN_DELETE_URL = '/sceneLinkage',
+  SCREEN_UPDATE_URL = '/sceneLinkage/update',
 }
 
 /**
  * 分页查询场景联动表格页面
  * @param params pageSize page name
  */
-export const screenLinkPageApi = () => {
+export const screenLinkPageGetApi = () => {
   return defHttp.get<ScreenLinkPageTableQueryParam>({
-    url: ScreenManagerApi.SCREEN_URL,
+    url: ScreenManagerApi.SCREEN_GET_URL,
   });
 };
 
-//模拟数据
-export const screenLinkPageApiList = () => {
-  return [
-    {
-      id: '10001',
-      name: '李丽',
-      act: 1,
-      stu: '启用',
-      desc: '好的好的',
-      createTime: '2021-11-20',
-    },
-    {
-      id: '10002',
-      name: '史芳',
-      act: 1,
-      stu: '停用',
-      desc: '好的好的',
-      createTime: '2021-11-20',
-    },
-    {
-      id: '10003',
+/**
+ * 新增场景联动
+ * @param params pageSize page name
+ */
+export const screenLinkPageAddApi = (params: ScreenAddModel) => {
+  return defHttp.post<ScreenLinkPageTableQueryParam>({
+    url: ScreenManagerApi.SCREEN_ADD_URL,
+    params,
+  });
+};
 
-      name: '程强',
-      act: 1,
-      stu: '启用',
-      desc: '好的好的',
-      createTime: '2021-11-20',
-    },
-    {
-      id: '10004',
-      name: '罗敏',
-      act: 1,
-      stu: '停用',
-      desc: '好的好的',
-      createTime: '2021-11-20',
-    },
-    {
-      id: '10005',
-      name: '蔡杰',
-      act: 1,
-      stu: '停用',
-      desc: '好的好的',
-      createTime: '2021-11-20',
+/**
+ * 更新场景联动
+ * @param params pageSize page name
+ */
+export const screenLinkPageUpdateApi = (params: ScreenUpdateModel) => {
+  return defHttp.post<ScreenLinkPageTableQueryParam>({
+    url: ScreenManagerApi.SCREEN_UPDATE_URL,
+    params,
+  });
+};
+
+/**
+ * 删除场景联动
+ * @param params pageSize page name
+ */
+export const screenLinkPageDeleteApi = (ids: string[]) => {
+  return defHttp.delete({
+    url: ScreenManagerApi.SCREEN_DELETE_URL,
+    data: {
+      ids: ids,
     },
-  ];
+  });
 };

-import {defHttp} from '/@/utils/http/axios';
-import {getMenuListResultModel} from './model/menuModel';
-import {useUserStore} from '/@/store/modules/user';
-import {RoleEnum} from '/@/enums/roleEnum';
+import { defHttp } from '/@/utils/http/axios';
+import { getMenuListResultModel } from './model/menuModel';
+import { useUserStore } from '/@/store/modules/user';
+import { RoleEnum } from '/@/enums/roleEnum';
 
 enum Api {
   BaseMenuUrl = '/menu',
   GetMenuList = '/menu/me/menus',
   SysAdminMenuList = '/admin/me/menus',
-  GetMenuIdsByRoleId = '/menu/getMenuIdsByRoleId/'
+  GetMenuIdsByRoleId = '/menu/getMenuIdsByRoleId/',
 }
 
 /**
@@ -17,17 +17,17 @@ enum Api {
 export const getMenuList = () => {
   const userStore = useUserStore();
   let url = Api.GetMenuList;
-  if (userStore.getRoleList.find(v => v == RoleEnum.ROLE_SYS_ADMIN)) {
+  if (userStore.getRoleList.find((v) => v == RoleEnum.ROLE_SYS_ADMIN)) {
     url = Api.SysAdminMenuList;
   }
-  return defHttp.get<getMenuListResultModel>({url: url});
+  return defHttp.get<getMenuListResultModel>({ url: url });
 };
 
 export const delMenu = (menuIds: string[]) => {
   let url = Api.BaseMenuUrl;
-  return defHttp.delete({url: url, data: menuIds})
-}
+  return defHttp.delete({ url: url, data: menuIds });
+};
 export const getMenusIdsByRoleId = (roleId: string) => {
   let url = Api.GetMenuIdsByRoleId + roleId;
-  return defHttp.get<Array<string>>({url: url});
-}
+  return defHttp.get<Array<string>>({ url: url });
+};

@@ -16,10 +16,31 @@
         <SaleRadar :loading="loading" class="enter-y" />
       </div>
     </div>
+    <BasicModal
+      @register="register"
+      v-bind="$attrs"
+      :mask="true"
+      :showCancelBtn="false"
+      :showOkBtn="false"
+      :canFullscreen="false"
+      :closable="false"
+      :maskStyle="maskColor"
+      :height="600"
+      :width="1500"
+      :maskClosable="false"
+      title="请修改密码"
+      :helpMessage="['请您修改密码']"
+    >
+      <PasswordDialog />
+    </BasicModal>
   </PageWrapper>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import PasswordDialog from '/@/views/system/password/index.vue';
+  import { BasicModal, useModal } from '/@/components/Modal';
+  import { getAuthCache } from '/@/utils/auth';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { ref, onMounted } from 'vue';
   import { Card } from 'ant-design-vue';
   import { PageWrapper } from '/@/components/Page';
   import WorkbenchHeader from './components/WorkbenchHeader.vue';
@@ -28,8 +49,23 @@
   import DynamicInfo from './components/DynamicInfo.vue';
   import SaleRadar from './components/SaleRadar.vue';
 
-  const loading = ref(true);
-
+  const maskColor = ref({ backgroundColor: 'grey' });
+  const statusModel = ref(false);
+  const [register, { openModal }] = useModal();
+  onMounted(() => {
+    const userInfo: object = getAuthCache(USER_INFO_KEY);
+    if (userInfo.needSetPwd == true) {
+      statusModel.value = true;
+      openModal(statusModel.value);
+    } else if (userInfo.needSetPwd == false) {
+      openModal(statusModel.value);
+    }
+  });
+  //Yunteng123456!!!
+  //Password123456!
+  //System123456!
+  //Testrole123456!
+  const loading = ref(false);
   setTimeout(() => {
     loading.value = false;
   }, 1500);

@@ -15,7 +15,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '状态',
-    dataIndex: 'stu',
+    dataIndex: 'status',
     width: 200,
     component: 'RadioButtonGroup',
     defaultValue: 0,
@@ -28,7 +28,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '描述',
-    dataIndex: 'desc',
+    dataIndex: 'description',
     width: 200,
   },
   {
@@ -50,7 +50,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'org',
+    field: 'organizationId',
     label: '所属组织',
     required: true,
     colProps: { span: 20 },
@@ -65,7 +65,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'desc',
+    field: 'description',
     label: '描述',
     // colProps: { span: 20 },
     component: 'InputTextArea',
@@ -77,7 +77,7 @@ export const formSchema: FormSchema[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'org',
+    field: 'organizationId',
     label: '所属组织',
     component: 'ApiTreeSelect',
     componentProps: {
@@ -86,7 +86,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 7 },
   },
   {
-    field: 'name1',
+    field: 'name',
     label: '名称',
     component: 'Input',
     colProps: { span: 8 },
@@ -95,7 +95,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 's1',
+    field: 'status',
     label: '状态',
     component: 'ApiSelect',
     componentProps: {

@@ -41,7 +41,12 @@
   import SceneLinkAgeDrawer from './useDrawer.vue';
   import { columns, searchFormSchema } from './config.d';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { screenLinkPageApiList } from '/@/api/ruleengine/ruleengineApi';
+  import {
+    screenLinkPageGetApi,
+    screenLinkPageAddApi,
+    screenLinkPageUpdateApi,
+    screenLinkPageDeleteApi,
+  } from '/@/api/ruleengine/ruleengineApi';
 
   export default defineComponent({
     name: 'DeviceManagement',
@@ -52,7 +57,7 @@
       const { createMessage } = useMessage();
       const [registerTable, { reload }] = useTable({
         title: '',
-        api: screenLinkPageApiList,
+        api: screenLinkPageGetApi,
         columns,
         formConfig: {
           labelWidth: 120,

@@ -3,12 +3,12 @@
     <!-- register 用于注册 useTable，如果需要使用useTable提供的 api，必须将 register 传入组件的 onRegister-->
     <!-- @fetch-success接口请求成功后触发 -->
     <BasicTable @register="registerTable" @fetch-success="onFetchSuccess">
-
       <!-- 通过模板，加载工具栏 -->
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">
           {{ getI18nCreateMenu }}
-        </a-button> <!-- 新增菜单-->
+        </a-button>
+        <!-- 新增菜单-->
       </template>
 
       <!-- 表格单项，操作 -->
@@ -23,7 +23,7 @@
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
-                title: getDeleteTitle(),//是否确认删除//getDeleteTitle()
+                title: getDeleteTitle(), //是否确认删除//getDeleteTitle()
                 confirm: handleDelete.bind(null, record),
               },
             },
@@ -33,135 +33,135 @@
     </BasicTable>
 
     <!-- 弹出框 -->
-    <MenuDrawer @register="registerDrawer" @success="handleSuccess"/>
+    <MenuDrawer @register="registerDrawer" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-//导入所需插件
-import {computed, defineComponent, nextTick} from 'vue';
-
-// 导入表格组件，表格事件
-import {BasicTable, useTable, TableAction} from '/@/components/Table';
-
-// 加载表格数据
-import {getMenuList, delMenu} from '/@/api/sys/menu';
-// 加载自定义侧边弹出框 组件
-import {useDrawer} from '/@/components/Drawer';
-
-// 导入子页面【新增、修改】
-import MenuDrawer from './MenuDrawer.vue';
-
-// 导入列 属性，和搜索栏内容
-import {columns, searchFormSchema} from './menu.data';
-import {useI18n} from "/@/hooks/web/useI18n";
-import {notification} from "ant-design-vue";
-
-// 自定义表格组件和属性
-export default defineComponent({
-  name: 'MenuManagement',
-  components: {BasicTable, MenuDrawer, TableAction},
-  setup() {
-    const [registerDrawer, {openDrawer}] = useDrawer();//使用右侧弹出框
-    const {t} = useI18n(); //加载国际化
-    // 新增菜单
-    const getI18nCreateMenu = computed(() => t('routes.common.system.pageSystemTitleCreateMenu'));
-
-    const [registerTable, {reload, expandAll}] = useTable({
-      title: t('routes.common.system.pageSystemTitleMenuList'),//'菜单列表'
-      api: getMenuList, //加载数据
-      columns,          //加载列
-      // formConfig: {
-      //   labelWidth: 120,
-      //   schemas: searchFormSchema,
-      // },
-      isTreeTable: true,
-      pagination: false,
-      striped: false,
-      // useSearchForm: true,
-      showTableSetting: true,
-      bordered: true,
-      showIndexColumn: false,
-      canResize: false,
-      actionColumn: {
-        width: 80,
-        title: t('routes.common.system.pageSystemTitleOperation'),//操作
-        dataIndex: 'action',
-        slots: {customRender: 'action'},
-        fixed: undefined,
-      },
-    });
-
-    /**
-     * 获得删除提示框的文字
-     */
-    function getDeleteTitle(): string {
-      let labelText = t('routes.common.system.pageSystemTitleWhetherDelete');
-      return labelText
-    }
-
-    /**
-     * 打开新增菜单
-     */
-    function handleCreate() {
-      openDrawer(true, {
-        isUpdate: false,
+  //导入所需插件
+  import { computed, defineComponent, nextTick } from 'vue';
+
+  // 导入表格组件，表格事件
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+
+  // 加载表格数据
+  import { getMenuList, delMenu } from '/@/api/sys/menu';
+  // 加载自定义侧边弹出框 组件
+  import { useDrawer } from '/@/components/Drawer';
+
+  // 导入子页面【新增、修改】
+  import MenuDrawer from './MenuDrawer.vue';
+
+  // 导入列 属性，和搜索栏内容
+  import { columns, searchFormSchema } from './menu.data';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { notification } from 'ant-design-vue';
+
+  // 自定义表格组件和属性
+  export default defineComponent({
+    name: 'MenuManagement',
+    components: { BasicTable, MenuDrawer, TableAction },
+    setup() {
+      const [registerDrawer, { openDrawer }] = useDrawer(); //使用右侧弹出框
+      const { t } = useI18n(); //加载国际化
+      // 新增菜单
+      const getI18nCreateMenu = computed(() => t('routes.common.system.pageSystemTitleCreateMenu'));
+      console.log(111);
+      const [registerTable, { reload, expandAll }] = useTable({
+        title: t('routes.common.system.pageSystemTitleMenuList'), //'菜单列表'
+        api: getMenuList, //加载数据
+        columns, //加载列
+        // formConfig: {
+        //   labelWidth: 120,
+        //   schemas: searchFormSchema,
+        // },
+        isTreeTable: true,
+        pagination: false,
+        striped: false,
+        // useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
+        canResize: false,
+        actionColumn: {
+          width: 80,
+          title: t('routes.common.system.pageSystemTitleOperation'), //操作
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: undefined,
+        },
       });
-    }
 
-    /**
-     * 打开 编辑菜单
-     * @param record
-     */
-    function handleEdit(record: Recordable) {
-      console.log("----------------------------333-------------"+record.parentId);
-      openDrawer(true, {
-        record,
-        isUpdate: true,
-      });
-    }
+      /**
+       * 获得删除提示框的文字
+       */
+      function getDeleteTitle(): string {
+        let labelText = t('routes.common.system.pageSystemTitleWhetherDelete');
+        return labelText;
+      }
 
-    /**
-     * 执行 删除操作
-     * @param record
-     */
-    async function handleDelete(record: Recordable) {
-      try {
-        let ids = [record.id,];
-        await delMenu(ids);
-        notification.success({
-          message: "成功",
-          description: "删除菜单成功",
-          duration: 3,
+      /**
+       * 打开新增菜单
+       */
+      function handleCreate() {
+        openDrawer(true, {
+          isUpdate: false,
         });
-        await reload();
-      } catch (e) {
-        return Promise.reject(e);
       }
-    }
 
-    /**
-     * 操作成功，重新加载页面
-     */
-    function handleSuccess() {
-      reload();
-    }
+      /**
+       * 打开 编辑菜单
+       * @param record
+       */
+      function handleEdit(record: Recordable) {
+        console.log('----------------------------333-------------' + record.parentId);
+        openDrawer(true, {
+          record,
+          isUpdate: true,
+        });
+      }
 
-    function onFetchSuccess() {
-      // 演示默认展开所有表项
-      nextTick(expandAll);
-    }
+      /**
+       * 执行 删除操作
+       * @param record
+       */
+      async function handleDelete(record: Recordable) {
+        try {
+          let ids = [record.id];
+          await delMenu(ids);
+          notification.success({
+            message: '成功',
+            description: '删除菜单成功',
+            duration: 3,
+          });
+          await reload();
+        } catch (e) {
+          return Promise.reject(e);
+        }
+      }
+
+      /**
+       * 操作成功，重新加载页面
+       */
+      function handleSuccess() {
+        reload();
+      }
+
+      function onFetchSuccess() {
+        // 演示默认展开所有表项
+        nextTick(expandAll);
+      }
 
-    return {
-      getDeleteTitle,
-      getI18nCreateMenu,
-      registerTable,
-      registerDrawer,
-      handleCreate,
-      handleEdit,
-      handleDelete,
-      handleSuccess,
-      onFetchSuccess,
-    };
-  },
-});
+      return {
+        getDeleteTitle,
+        getI18nCreateMenu,
+        registerTable,
+        registerDrawer,
+        handleCreate,
+        handleEdit,
+        handleDelete,
+        handleSuccess,
+        onFetchSuccess,
+      };
+    },
+  });
 </script>

@@ -10,18 +10,18 @@
   </PageWrapper>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { PageWrapper } from '/@/components/Page';
   import { BasicForm, useForm } from '/@/components/Form';
-  import {USER_INFO_KEY} from "/@/enums/cacheEnum";
-  import {getAuthCache} from "/@/utils/auth";
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
   import { formSchema } from './pwd.data';
-  import {resetPassword} from "/@/api/system/system";
-  import {useMultipleTabStore} from "/@/store/modules/multipleTab";
-  import {useUserStore} from "/@/store/modules/user";
-  import {useAppStore} from "/@/store/modules/app";
-  import {usePermissionStore} from "/@/store/modules/permission";
-  import {useMessage} from "/@/hooks/web/useMessage";
+  import { resetPassword } from '/@/api/system/system';
+  import { useMultipleTabStore } from '/@/store/modules/multipleTab';
+  import { useUserStore } from '/@/store/modules/user';
+  import { useAppStore } from '/@/store/modules/app';
+  import { usePermissionStore } from '/@/store/modules/permission';
+  import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
     name: 'ChangePassword',
     components: { BasicForm, PageWrapper },
@@ -36,35 +36,35 @@
       const userStore = useUserStore();
       const appStore = useAppStore();
       const permissionStore = usePermissionStore();
-      const {createMessage} = useMessage();
+      const { createMessage } = useMessage();
       const userInfo = getAuthCache(USER_INFO_KEY);
-      console.log(userInfo,"userInfo")
+      // console.log(userInfo, 'userInfo');
       async function handleSubmit() {
         try {
           const values = await validate();
           const { passwordOld, passwordNew } = values;
           const params = {
-            userId:userInfo.userId,
-            password:passwordOld,
-            resetPassword:passwordNew
+            userId: userInfo.userId,
+            password: passwordOld,
+            resetPassword: passwordNew,
           };
 
-          await resetPassword(params).then((result)=>{
-           if(result.data){
-             createMessage.success("修改成功");
-             setTimeout(function (){
-               localStorage.clear();
-               appStore.resetAllState();
-               permissionStore.resetState();
-               tabStore.resetState();
-               userStore.resetState();
-               location.reload();
-             },500)
-           }
+          await resetPassword(params).then((result) => {
+            if (result.data) {
+              createMessage.success('修改成功');
+              // /dashboard/analysis
+              setTimeout(function () {
+                localStorage.clear();
+                appStore.resetAllState();
+                permissionStore.resetState();
+                tabStore.resetState();
+                userStore.resetState();
+                location.reload();
+              }, 500);
+            }
           });
         } catch (error) {}
       }
-
       return { register, resetFields, handleSubmit };
     },
   });

@@ -112,7 +112,6 @@
                 }
               });
             });
-            console.log(roleMenus.value);
             proxy.$refs.tree.setCheckedKeys(roleMenus.value);
             roleId.value = data.record.id;
           }
@@ -145,6 +144,7 @@
       }
       // Tree check事件
       const handleCheckClick = (_, e) => {
+        allCheckedKeys.value = [];
         let nodes = e.checkedNodes;
         let halfKeys = e.halfCheckedKeys;
         nodes.map((node) => {
@@ -156,12 +156,6 @@
         });
         allCheckedKeys.value.push(...halfKeys);
       };
-      // const handleCheckClick = (checkedKeys: string[], { halfCheckedKeys }) => {
-      //   allCheckedKeys.value = [...checkedKeys, ...halfCheckedKeys];
-      //   // 父节点
-      //   roleHalfCheckedKeys.value = halfCheckedKeys;
-      // };
-
       return {
         allCheckedKeys,
         registerDrawer,