Merge branch 'main' of http://git.yuntengiot.com/huang/yun-teng-iot-front

 export default {
 export default {
-  dashboard: 'Dashboard',
+  dashboard: '首页',
   about: '关于',
   about: '关于',
-  workbench: '工作台',
+  workbench: '首页',
   analysis: '分析页',
   analysis: '分析页',
 };
 };

@@ -29,11 +29,11 @@ const { createMessage, createErrorModal } = useMessage();
 
 
 const getJwtTokenInfo = getAuthCache(REFRESH_TOKEN_KEY);
 const getJwtTokenInfo = getAuthCache(REFRESH_TOKEN_KEY);
 const getRefreshTokenInfo = getAuthCache(JWT_TOKEN_KEY);
 const getRefreshTokenInfo = getAuthCache(JWT_TOKEN_KEY);
-console.log(getJwtTokenInfo);
-console.log(getRefreshTokenInfo);
+// console.log(getJwtTokenInfo);
+// console.log(getRefreshTokenInfo);
 const getRefreshTokenInfo1 = getAuthCache(PROJ_CFG_KEY);
 const getRefreshTokenInfo1 = getAuthCache(PROJ_CFG_KEY);
 
 
-console.log(getRefreshTokenInfo1);
+// console.log(getRefreshTokenInfo1);
 
 
 /**
 /**
  * @description: 数据处理，方便区分多种处理方式
  * @description: 数据处理，方便区分多种处理方式

@@ -12,14 +12,49 @@
     <div class="md:w-3/10 w-full enter-y">
     <div class="md:w-3/10 w-full enter-y">
       <HelpDoc />
       <HelpDoc />
     </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>
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <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 GrowCard from './components/GrowCard.vue';
   import GrowCard from './components/GrowCard.vue';
   import SiteAnalysis from './components/SiteAnalysis.vue';
   import SiteAnalysis from './components/SiteAnalysis.vue';
   import { Card } from 'ant-design-vue';
   import { Card } from 'ant-design-vue';
   import HelpDoc from './components/HelpDoc.vue';
   import HelpDoc from './components/HelpDoc.vue';
+
+  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);
+    }
+  });
   const loading = ref(true);
   const loading = ref(true);
   setTimeout(() => {
   setTimeout(() => {
     loading.value = false;
     loading.value = false;

@@ -70,7 +70,7 @@
           });
           });
 
 
           //编辑模式，菜单名称为不可用
           //编辑模式，菜单名称为不可用
-          updateSchema({ field: 'title', componentProps: { disabled: true } });
+          updateSchema({ field: 'title', componentProps: { disabled: false } });
         }
         }
         if (isUpdate.value) {
         if (isUpdate.value) {
           menuId = Reflect.get(data.record, 'id');
           menuId = Reflect.get(data.record, 'id');
@@ -128,7 +128,6 @@
             status: Reflect.get(values, 'status'),
             status: Reflect.get(values, 'status'),
           };
           };
           Reflect.set(values, 'meta', metaTemp);
           Reflect.set(values, 'meta', metaTemp);
-
           // saveMenu
           // saveMenu
           const data = await saveMenuApi(values, isUpdate.value);
           const data = await saveMenuApi(values, isUpdate.value);
           console.log('_______保存返回结果____data:' + data);
           console.log('_______保存返回结果____data:' + data);

@@ -54,8 +54,8 @@ export const columns: BasicColumn[] = [
       const status = record.meta.status;
       const status = record.meta.status;
       const enable = ~~status === 0;
       const enable = ~~status === 0;
       const color = enable ? 'green' : 'red';
       const color = enable ? 'green' : 'red';
-      let enableText: string = t('routes.common.system.tableTitleSystemEnable'); //国际化处理--启用
-      let stopText: string = t('routes.common.system.tableTitleSystemStop'); //国际化处理--停用
+      const enableText: string = t('routes.common.system.tableTitleSystemEnable'); //国际化处理--启用
+      const stopText: string = t('routes.common.system.tableTitleSystemStop'); //国际化处理--停用
       const text = enable ? enableText : stopText;
       const text = enable ? enableText : stopText;
       return h(Tag, { color: color }, () => text);
       return h(Tag, { color: color }, () => text);
     },
     },

@@ -50,7 +50,6 @@
       const treeData = ref<TreeItem[]>([]);
       const treeData = ref<TreeItem[]>([]);
       const roleMenus = ref<string[]>([]);
       const roleMenus = ref<string[]>([]);
       const allCheckedKeys = ref<string[]>([]);
       const allCheckedKeys = ref<string[]>([]);
-      const roleHalfCheckedKeys = ref<string[]>([]);
       const roleId = ref<string>('');
       const roleId = ref<string>('');
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
         labelWidth: 90,