Explorar el Código

1.修改mix。2.header

jiaxiaoqiang hace 11 meses
padre
commit
c234de7140

+ 6 - 10
src/common/configs/dictDataUtil.ts

@@ -8,7 +8,7 @@ const DictDataUtil = {
     import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dept/parent/list",
   post_list_url: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/post/list",
 
-  img_url:import.meta.env.VITE_APP_UPLOAD_URL,
+  img_url: import.meta.env.VITE_APP_UPLOAD_URL,
 
   TYPE_CODE: {
     //订单类型
@@ -55,21 +55,17 @@ const DictDataUtil = {
     prepare_data_file: "prepare_data_file",
     //生产准备-工艺文件
     prepare_craft_file: "prepare_craft_file",
- //   生产计划-工位任务状态
+    //   生产计划-工位任务状态
     station_task_state: "station_task_state",
-//领用申请状态
-    requisition_state:"requisition_state",
+    //领用申请状态
+    requisition_state: "requisition_state",
     //委外状态
     outsource_state: "outsource_state",
     work_order_seq_state: "work_order_seq_state",
     //报故状态
-    escalation_fault_state:"escalation_fault_state",
+    escalation_fault_state: "escalation_fault_state",
     //报故追踪状态状态
-    fault_current_state:"fault_current_state",
-
-    defect_mana:"defect_mana",
-
-
+    fault_current_state: "fault_current_state",
   },
   EXPAND_FIELD_TABLE: {
     //字段类型

+ 1 - 0
src/layout/components/NavBar/components/NavbarRight.vue

@@ -279,6 +279,7 @@ const userCenter = () => {
   color: var(--el-text-color);
   text-align: center;
   cursor: pointer;
+  margin-right: 10px;
 
   &:hover {
     background: rgb(0 0 0 / 10%);

+ 1 - 1
src/store/modules/settings.ts

@@ -21,7 +21,7 @@ export const useSettingsStore = defineStore("setting", () => {
     defaultSettings.fixedHeader
   );
   // 布局模式:left-左侧模式(默认) top-顶部模式 mix-混合模式
-  const layout = useStorage<string>("layout", defaultSettings.layout);
+  const layout = "mix"; //useStorage<string>("layout", defaultSettings.layout);
   // 主题颜色
   const themeColor = useStorage<string>(
     "themeColor",