diff --git a/src/components/layout/src/Layout.vue b/src/components/layout/src/Layout.vue index 01d3371..400d2d1 100644 --- a/src/components/layout/src/Layout.vue +++ b/src/components/layout/src/Layout.vue @@ -64,7 +64,7 @@ class="l-footer" :style="{ background: settingsStore.isDark ? '#1e1e1e' : '#fff' }" > -
Copyright © {{ dayjs().year() }} 湖南长沪信息科技有限公司
+
Copyright © {{ dayjs().year() }}
diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 33be29b..f2f1a57 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -46,7 +46,7 @@ diff --git a/src/views/personnelManagement/departmentStructure/index.vue b/src/views/personnelManagement/departmentStructure/index.vue index 96a588a..1cc0584 100644 --- a/src/views/personnelManagement/departmentStructure/index.vue +++ b/src/views/personnelManagement/departmentStructure/index.vue @@ -289,6 +289,7 @@ const resetModelValue = () => { userValue.value = { ...userDefaultValue }; + title.value = '新增库存' }; const addUserOrUpdate = ()=>{ @@ -396,7 +397,7 @@ }); const loading = ref(false); const modalRef = ref(); - const title = ref("新增"); + const title = ref("新增库存"); const addDepartmentStructure = () => { modalRef.value = modal.create({ title: title.value, diff --git a/src/views/smartRecipes/dishesManagement/index.ts b/src/views/smartRecipes/dishesManagement/index.ts index e1eec91..724e982 100644 --- a/src/views/smartRecipes/dishesManagement/index.ts +++ b/src/views/smartRecipes/dishesManagement/index.ts @@ -44,7 +44,7 @@ const datalist:DishesValue[] = [ essentials:"1.鸡蛋打散,炒熟备用。\n2.热锅烧油,放入西红柿翻炒。\n3.加入盐,白糖,鸡精炒熟。\n4.放入鸡蛋,翻拌均匀。\n5.生粉加水调匀,淋入锅中,收汁出锅。", fat: 2.72, fruitsVegetables:70, - image:"https://file.wy2020.com/admin/weiyi/img/vip/nutri/dish/cbf28b18d47a4c378ad7c702dc9da6f8_1280w_956h.jpg?x-image-process=image/resize,m_lfit,h_25,w_25", + image:"https://file.wy2020.com/admin/weiyi/img/vip/nutri/dish/cbf28b18d47a4c378ad7c702dc9da6f8_1280w_956h.jpg", meatEgg:30, name :"西红柿炒鸡蛋", percentage:"西红柿70% :鸡蛋30%", @@ -72,7 +72,7 @@ const datalist:DishesValue[] = [ essentials:"1.鸡蛋打散,炒熟备用。\n2.热锅烧油,放入西红柿翻炒。\n3.加入盐,白糖,鸡精炒熟。\n4.放入鸡蛋,翻拌均匀。\n5.生粉加水调匀,淋入锅中,收汁出锅。", fat: 2.72, fruitsVegetables:70, - image:"https://file.wy2020.com/admin/weiyi/img/vip/nutri/dish/cbf28b18d47a4c378ad7c702dc9da6f8_1280w_956h.jpg?x-image-process=image/resize,m_lfit,h_25,w_25", + image:"https://file.wy2020.com/admin/weiyi/img/vip/nutri/dish/8b654afe895e11e6b87c0242ac110003_650w_650h.jpg", meatEgg:30, name :"西红柿炒鸡蛋", percentage:"西红柿70% :鸡蛋30%", @@ -100,7 +100,7 @@ const datalist:DishesValue[] = [ essentials:"1.鸡蛋打散,炒熟备用。\n2.热锅烧油,放入西红柿翻炒。\n3.加入盐,白糖,鸡精炒熟。\n4.放入鸡蛋,翻拌均匀。\n5.生粉加水调匀,淋入锅中,收汁出锅。", fat: 2.72, fruitsVegetables:70, - image:"https://file.wy2020.com/admin/weiyi/img/vip/nutri/dish/cbf28b18d47a4c378ad7c702dc9da6f8_1280w_956h.jpg?x-image-process=image/resize,m_lfit,h_25,w_25", + image:"https://file.wy2020.com/admin/weiyi/img/vip/nutri/dish/cbf28b18d47a4c378ad7c702dc9da6f8_1280w_956h.jpg", meatEgg:30, name :"西红柿炒鸡蛋", percentage:"西红柿70% :鸡蛋30%", @@ -128,7 +128,7 @@ const datalist:DishesValue[] = [ essentials:"1.鸡蛋打散,炒熟备用。\n2.热锅烧油,放入西红柿翻炒。\n3.加入盐,白糖,鸡精炒熟。\n4.放入鸡蛋,翻拌均匀。\n5.生粉加水调匀,淋入锅中,收汁出锅。", fat: 2.72, fruitsVegetables:70, - image:"https://file.wy2020.com/admin/weiyi/img/vip/nutri/dish/cbf28b18d47a4c378ad7c702dc9da6f8_1280w_956h.jpg?x-image-process=image/resize,m_lfit,h_25,w_25", + image:"https://file.wy2020.com/admin/weiyi/img/vip/nutri/dish/cbf28b18d47a4c378ad7c702dc9da6f8_1280w_956h.jpg", meatEgg:30, name :"西红柿炒鸡蛋", percentage:"西红柿70% :鸡蛋30%", diff --git a/src/views/smartRecipes/dishesManagement/index.vue b/src/views/smartRecipes/dishesManagement/index.vue index fa0ec31..bf1f49e 100644 --- a/src/views/smartRecipes/dishesManagement/index.vue +++ b/src/views/smartRecipes/dishesManagement/index.vue @@ -184,8 +184,8 @@ width: 100, render: (value: any) => { return ( - ); @@ -418,6 +418,7 @@ const resetModelValue = () => { userValue.value = { ...userDefaultValue }; + title.value = '添加食材原料' }; const addUserOrUpdate = () => { diff --git a/src/views/smartRecipes/foodManagement/index.vue b/src/views/smartRecipes/foodManagement/index.vue index 0e6bbed..06ccda0 100644 --- a/src/views/smartRecipes/foodManagement/index.vue +++ b/src/views/smartRecipes/foodManagement/index.vue @@ -376,6 +376,7 @@ const resetModelValue = () => { userValue.value = { ...userDefaultValue }; + title.value = '添加食材原料' }; const addUserOrUpdate = () => { diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 2b80bef..360a456 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -203,6 +203,8 @@ default: () => "确认要除么?" }} + + 菜单授权 ); } @@ -249,6 +251,7 @@ const resetModelValue = () => { userValue.value = { ...userRoleValue }; + title.value = '新增角色' }; const addUserOrUpdate = () => { diff --git a/src/views/system/user/index.ts b/src/views/system/user/index.ts index e69de29..35801be 100644 --- a/src/views/system/user/index.ts +++ b/src/views/system/user/index.ts @@ -0,0 +1,102 @@ +export interface userInterface { + /** + * @snowFlakeId 头像 + */ + snowFlakeId?: string + /** + * @name 头像 + */ + avatar?: string + /** + * @name 用户名_必传 + */ + name: string + /** + * @sex 性别_必传 + */ + sex: string + /** + * @phoneNumber 手机号_必传 + */ + phoneNumber: string + /** + * @phoneNumber 账号状态_必传 + */ + + status: string + + /** + * @authClient 授权的客户端_必传 + */ + + authClient?: any[] + /** + * @deptIds 所属部门id_必传 + */ + + deptIds?: any[] + /** + * @roleIds 所属角色id_必传 + */ + + roleIds?: any[] + lastLoginTime?:string +} +export interface passwordInterface { + oldPassword: string + newPassword: string + confirmPassword: string +} + + +const userInfo:userInterface[] = [ + { + avatar:'https://file.wy2020.com/admin/weiyi/img/mqtts/morning/record/1920283993400512513_headImg.jpg', + name:'刘德华', + sex:'man', + phoneNumber:'13575426241', + status:'enable', + lastLoginTime:'2025-05-09 09:45:37' + }, + { + avatar:'', + name:'张学友', + sex:'man', + phoneNumber:'13575426241', + status:'enable', + lastLoginTime:'2025-05-09 09:45:37' + }, + { + avatar:'https://file.wy2020.com/admin/weiyi/img/mqtts/morning/record/1920283993400512513_headImg.jpg', + name:'黎明', + sex:'man', + phoneNumber:'13575426241', + status:'enable', + lastLoginTime:'2025-05-09 09:45:37' + },{ + avatar:'', + name:'郭富城', + sex:'man', + phoneNumber:'13575426241', + status:'enable', + lastLoginTime:'2025-05-09 09:45:37' + }, + { + avatar:'https://file.wy2020.com/admin/weiyi/img/mqtts/morning/record/1920283993400512513_headImg.jpg', + name:'你', + sex:'woman', + phoneNumber:'13575426241', + status:'enable', + lastLoginTime:'2025-05-09 09:45:37' + }, + { + avatar:'', + name:'他', + sex:'woman', + phoneNumber:'13575426241', + status:'enable', + + } +] + +export default userInfo \ No newline at end of file diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index fb533ca..30f765c 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -1,11 +1,456 @@ + - \ No newline at end of file + diff --git a/src/views/workAccounts/index.vue b/src/views/workAccounts/index.vue index 57684fa..992b66b 100644 --- a/src/views/workAccounts/index.vue +++ b/src/views/workAccounts/index.vue @@ -276,6 +276,7 @@ const resetModelValue = () => { userValue.value = { ...workAccountsValueList }; + title.value = '添加晨检记录' }; const addUserOrUpdate = () => {