Merge remote-tracking branch 'origin/ohos' into ohos

.env.development

@@ -8,7 +8,7 @@ VITE_APP_PORT = 4001
 VITE_APP_BASE_API = '/dev-api'
 
 # 开发接口地址
-VITE_APP_API_URL = 'http://192.168.1.69:7205/'
+VITE_APP_API_URL = 'http://192.168.1.3:7205/'
 
 # VITE_APP_API_URL = 'http://192.168.1.43:7205/'
 # VITE_APP_API_URL = 'http://192.168.1.4:18000/'

src/layout/components/Settings/index.vue

@@ -84,12 +84,14 @@ function changeThemeColor(color: string) {
 /**
  * 切换主题
  */
-const isDark = ref<boolean>(settingsStore.theme === ThemeEnum.DARK);
+const isDark = ref<boolean>(true);
 const changeTheme = (val: any) => {
   isDark.value = val;
   settingsStore.changeTheme(isDark.value ? ThemeEnum.DARK : ThemeEnum.LIGHT);
 };
-
+onMounted(() => {
+  changeTheme(true);
+});
 /**
  * 切换布局
  */

src/styles/font.css

@@ -0,0 +1,29 @@
+@font-face {
+  font-family: "HarmonyOS_Sans_Medium";
+  src: url("../assets/fonts/HarmonyOS_Sans_Medium.ttf");
+}
+
+@font-face {
+  font-family: "HarmonyOS_Sans_Black";
+  src: url("../assets/fonts/HarmonyOS_Sans_Black.ttf");
+}
+
+@font-face {
+  font-family: "HarmonyOS_Sans_Bold";
+  src: url("../assets/fonts/HarmonyOS_Sans_Bold.ttf");
+}
+
+@font-face {
+  font-family: "HarmonyOS_Sans_Light";
+  src: url("../assets/fonts/HarmonyOS_Sans_Light.ttf");
+}
+
+@font-face {
+  font-family: "HarmonyOS_Sans_Regular";
+  src: url("../assets/fonts/HarmonyOS_Sans_Regular.ttf");
+}
+
+@font-face {
+  font-family: "HarmonyOS_Sans_Thin";
+  src: url("../assets/fonts/HarmonyOS_Sans_Thin.ttf");
+}

src/styles/index.scss

@@ -1,6 +1,7 @@
 @use "./reset";
 @import "@vue-flow/core/dist/style.css";
 @import "@vue-flow/core/dist/theme-default.css";
+@import "./font.css";
 
 .app-container {
   padding: 10px;

src/styles/reset.scss

@@ -28,6 +28,7 @@ body {
   overflow: hidden;
   margin: 0;
   font-family:
+    "HarmonyOS_Sans_Light",
     "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
     "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
   line-height: inherit;

src/styles/variables.scss

@@ -2,7 +2,7 @@
 
 :root {
   --menu-background: #304156;
-  --menu-text: #bfcbd9;
+  --menu-text: #fff;
   --menu-active-text: var(--el-menu-active-color);
   --menu-hover: #263445;
   --sidebar-logo-background: #2d3748;

src/views/main/components/header.vue

@@ -1,28 +1,27 @@
 <template>
   <div class="main-header">
     <div class="main-logo">
-      <img src="@/assets/logo.png" alt="" />
-      <span>维修检测平台</span>
+      <span style="font-size: 30px; color: white">维修检测平台</span>
     </div>
-    <div class="main-user" ref="buttonRef" @click="onClickOutside">
+    <div class="main-user" ref="buttonRef">
+      <div
+        style="
+          background-color: var(--ohos-box-bg);
+          border-radius: 50%;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        "
+      >
+        <svg-icon
+          class="activeNotice"
+          icon-class="closeI"
+          size="47"
+          @click="toExitApp"
+        />
+      </div>
       <span class="user-name">李明华</span>
-      <svg-icon icon-class="user" size="22" />
     </div>
-    <el-popover
-      :teleported="false"
-      ref="popoverRef"
-      :virtual-ref="buttonRef"
-      trigger="click"
-      title=""
-      virtual-triggering
-    >
-      <div class="loginOut" @click="deviceResourceFun">仪器资源</div>
-      <div class="loginOut" @click="goToManange">部门管理</div>
-      <div class="loginOut" @click="gotoDictPage">字典管理</div>
-      <div class="loginOut" @click="userCenter">修改密码</div>
-      <!--      <div class="loginOut" @click="loginOutFun">退出登录</div>-->
-      <div class="loginOut" @click="toExitApp">退出系统</div>
-    </el-popover>
 
     <UserCenter ref="userCenterRef" />
   </div>
@@ -71,7 +70,8 @@ const gotoDictPage = () => {
 .main-header {
   width: 100%;
   height: $main-header-height;
-  background-color: $hj-white-1;
+  border-bottom: 1px solid white;
+  background-color: #000;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -122,8 +122,8 @@ const gotoDictPage = () => {
 
     .user-name {
       margin-right: 10px;
-      font-size: var(--hj-fs-14);
-      color: var(--fc-color-4);
+      font-size: 20px;
+      color: white;
     }
   }
 }