Commit 4ca39986 by 毛勇泽

重构

parent eabf9503
{ {
"name": "common", "license": "ISC",
"version": "1.0.0", "types": "",
"description": "Please describe the basic information.", "devDependencies": {},
"main": "index.ets",
"name": "@ohos/common", "name": "@ohos/common",
"author": "", "description": "a npm package which contains arkUI2.0 page",
"license": "Apache-2.0", "main": "index.ets",
"version": "1.0.0",
"dependencies": {} "dependencies": {}
} }
...@@ -6,5 +6,7 @@ ...@@ -6,5 +6,7 @@
"name": "@ohos/direct", "name": "@ohos/direct",
"author": "", "author": "",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": {} "dependencies": {
"@ohos/common": "file:../../common"
}
} }
{ {
"name": "materialmanagement",
"version": "1.0.0", "version": "1.0.0",
"description": "Please describe the basic information.", "description": "Please describe the basic information.",
"main": "index.ets", "main": "index.ets",
"name": "@ohos/material", "name": "@ohos/material",
"author": "", "author": "",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": {} "dependencies": {
"@ohos/common": "file:../../common"
}
} }
import router from '@ohos.router'; import router from '@ohos.router';
import ItemData from '../viewmodel/ItemData';
import gridWordModel from '../viewmodel/GridWordViewModel';
import {
BreakpointSystem,
Logger,
StyleConstants,
BreakpointConstants
} from '@ohos/common';
@Entry
@Component @Component
export struct MaterialManagement { export struct MaterialManagement {
build(){ build(){
...@@ -8,9 +17,10 @@ export struct MaterialManagement { ...@@ -8,9 +17,10 @@ export struct MaterialManagement {
Row() { Row() {
Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
Text("物资管理") Text("物资管理")
.fontSize(21) .fontWeight(FontWeight.Medium)
.fontColor('#0fa983') .fontSize(24)
Image($r("app.media.ic_back")).size({ width: 55, height: 55 }).padding(15) .fontColor('#fff')
Image($r("app.media.menu")).size({ width: 55, height: 55 }).padding(15)
.onClick(()=>{ .onClick(()=>{
router.pushUrl({ router.pushUrl({
url: 'pages/setup/SetUpPage', url: 'pages/setup/SetUpPage',
...@@ -18,8 +28,53 @@ export struct MaterialManagement { ...@@ -18,8 +28,53 @@ export struct MaterialManagement {
}) })
}.margin(15) }.margin(15)
}.margin({ top: 15 }) }.margin({ top: 15 })
Grid() {
ForEach(gridWordModel.getGridWorkData(), (secondItem: ItemData) => {
GridItem() {
Column() {
Image(secondItem.img).borderRadius(12)
.height("62%")
.onClick(() => {
// router.pushUrl({ url: CommonConstants.PLAY_PAGE });
this.onGridItemClick(secondItem.others);
})
Text(secondItem.title).width('94.4%')
.fontSize(14)
.fontWeight(500)
.fontColor('#fff')
.textAlign(TextAlign.Center)
.margin({ top: 8 })
}.backgroundColor('#0fa983')
.borderRadius($r('app.float.home_list_padding'))
.padding(10)
.height('100%')
}
.padding({ top: $r('app.float.home_list_padding'), left: $r('app.float.home_list_padding') })
.borderRadius($r('app.float.home_backgroundImage_borderRadius'))
.align(Alignment.TopStart)
.backgroundImageSize(ImageSize.Auto)
.width("100%")
.height("100%")
}, (secondItem: ItemData) => JSON.stringify(secondItem))
}
.width("100%")
.height('40%')
.columnsTemplate('1fr 1fr')
.rowsTemplate('1fr 1fr 1fr 1fr')
.columnsGap($r('app.float.home_grid_columnsGap'))
.rowsGap($r('app.float.home_grid_rowGap'))
.margin({ bottom: $r('app.float.setting_account_fontSize') })
} }
}.backgroundColor("#c7d799")
} }
} }
onGridItemClick(type?:string):void {
switch (type) {
case "in":
router.pushUrl({
url: 'pages/in_out/InWorkPage',
})
break;
}
} }
} }
\ No newline at end of file
import ItemData from './ItemData';
export class GridWordViewModel {
/**
* Get data of the second grid.
*
* @return {Array<PageResource>} secondGridData.
*管理
*/
getGridWorkData(): Array<ItemData> {
let secondGridData: ItemData[] = [
new ItemData($r('app.string.wz_out'), $r('app.media.font'), 'in'),
new ItemData($r('app.string.wz_in'), $r('app.media.font'), 'out'),
new ItemData($r('app.string.wz_exchange'), $r('app.media.font'), 'exchange'),
new ItemData($r('app.string.wz_reverse'), $r('app.media.font'), 'reverse'),
new ItemData($r('app.string.wz_inv'), $r('app.media.font'), 'inv'),
new ItemData($r('app.string.wz_conversion'), $r('app.media.font'), 'conversion'),
new ItemData($r('app.string.wz_position'), $r('app.media.font'), 'position')
]
;
return secondGridData;
}
}
export default new GridWordViewModel();
\ No newline at end of file
export default class PageResource{
/**
* Text of list item.
*/
title: Resource;
/**
* Image of list item.
*/
img: Resource;
/**
* Other resource of list item.
*/
others?: string;
constructor(title:Resource,image:Resource,others:string) {
this.title=title;
this.img=image;
this.others=others;
}
}
\ No newline at end of file
{
"color": [
{
"name": "start_window_background",
"value": "#FFFFFF"
},
{
"name": "white",
"value": "#FFFFFF"
},
{
"name": "rank_first_gradient_start",
"value": "#FFFF9A"
},
{
"name": "rank_first_gradient_end",
"value": "#CCA538"
},
{
"name": "rank_first_border",
"value": "#9E8A24"
},
{
"name": "rank_first_text",
"value": "#9E8A24"
},
{
"name": "rank_secondary_gradient_start",
"value": "#B8B8B8"
},
{
"name": "rank_secondary_gradient_end",
"value": "#9C9C9C"
},
{
"name": "rank_secondary_border",
"value": "#7E7E7E"
},
{
"name": "rank_secondary_text",
"value": "#FFFFFF"
},
{
"name": "rank_third_gradient_start",
"value": "#B9A185"
},
{
"name": "rank_third_gradient_end",
"value": "#AE8659"
},
{
"name": "rank_third_border",
"value": "#775C3E"
},
{
"name": "rank_third_text",
"value": "#FFFFFF"
},
{
"name": "rank_view_color_holder",
"value": "#FFFFFF"
},
{
"name": "item_color",
"value": "#007DFF"
},
{
"name": "item_color_black",
"value": "#182431"
},
{
"name": "home_grid_fontColor",
"value": "#99182431"
},
{
"name": "background",
"value": "#F1F3F5"
},
{
"name": "font_description",
"value": "#989A9C"
},
{
"name": "circle_text_background",
"value": "#007dff"
},
{
"name": "page_background",
"value": "#F1F3F5"
}
,
{
"name": "title_background",
"value": "#4c9a6b"
}
,
{
"name": "disabledColor",
"value": "#dddadc"
}
,
{
"name": "head_title",
"value": "#FFEBCD"
}
]
}
\ No newline at end of file
{
"float": [
{
"name": "logo_image_size",
"value": "128vp"
},
{
"name": "logo_margin_top",
"value": "50vp"
},
{
"name": "logo_margin_bottom",
"value": "8vp"
},
{
"name": "page_title_text_size",
"value": "24fp"
},
{
"name": "normal_text_size",
"value": "16fp"
},
{
"name": "big_text_size",
"value": "18fp"
},
{
"name": "small_text_size",
"value": "14fp"
},
{
"name": "little_text_size",
"value": "12fp"
},
{
"name": "login_more_margin_bottom",
"value": "30vp"
},
{
"name": "login_more_margin_top",
"value": "8vp"
},
{
"name": "login_input_height",
"value": "45vp"
},
{
"name": "forgot_margin_top",
"value": "8vp"
},
{
"name": "input_margin_top",
"value": "12vp"
},
{
"name": "line_height",
"value": "1vp"
},
{
"name": "login_button_height",
"value": "40vp"
},
{
"name": "login_button_margin_top",
"value": "87vp"
},
{
"name": "login_button_margin_bottom",
"value": "12vp"
},
{
"name": "vertical_line_margin",
"value": "15vp"
},
{
"name": "login_progress_size",
"value": "30vp"
},
{
"name": "login_progress_margin_top",
"value": "20vp"
},
{
"name": "other_login_margin_top",
"value": "50vp"
},
{
"name": "other_login_margin_bottom",
"value": "12vp"
},
{
"name": "login_page_padding_bottom",
"value": "24vp"
},
{
"name": "other_login_image_size",
"value": "48vp"
},
{
"name": "page_padding_hor",
"value": "12vp"
},
{
"name": "mainPage_baseTab_top",
"value": "4vp"
},
{
"name": "mainPage_baseTab_margin",
"value": "8vp"
},
{
"name": "mainPage_padding",
"value": "12vp"
},
{
"name": "mainPage_barHeight",
"value": "56vp"
},
{
"name": "mainPage_baseTab_size",
"value": "25vp"
},
{
"name": "main_tab_fontSize",
"value": "10fp"
},
{
"name": "mainPage_tabTitles_margin",
"value": "12vp"
},
{
"name": "mainPage_tabTitles_padding",
"value": "12vp"
},
{
"name": "home_swiper_borderRadius",
"value": "16vp"
},
{
"name": "home_swiper_margin",
"value": "24vp"
},
{
"name": "home_grid_columnsGap",
"value": "8vp"
},
{
"name": "home_grid_rowGap",
"value": "12vp"
},
{
"name": "home_grid_padding",
"value": "12vp"
},
{
"name": "home_grid_height",
"value": "124vp"
},
{
"name": "home_grid_margin",
"value": "10vp"
},
{
"name": "home_list_margin",
"value": "4vp"
},
{
"name": "home_list_padding",
"value": "8vp"
},
{
"name": "home_grid_borderRadius",
"value": "24vp"
},
{
"name": "home_text_margin",
"value": "12vp"
},
{
"name": "home_backgroundImage_borderRadius",
"value": "12vp"
},
{
"name": "home_secondGrid_height",
"value": "260vp"
},
{
"name": "home_secondGrid_margin",
"value": "10vp"
},
{
"name": "home_homeCell_size",
"value": "24vp"
},
{
"name": "home_homeCell_margin",
"value": "4vp"
},
{
"name": "home_homeCell_width",
"value": "80vp"
},
{
"name": "home_homeCell_height",
"value": "80vp"
},
{
"name": "setting_name_margin",
"value": "4vp"
},
{
"name": "setting_account_margin",
"value": "24vp"
},
{
"name": "setting_account_size",
"value": "48vp"
},
{
"name": "setting_account_fontSize",
"value": "20fp"
},
{
"name": "setting_account_text_height",
"value": "28vp"
},
{
"name": "setting_account_height",
"value": "96vp"
},
{
"name": "setting_account_padding",
"value": "24vp"
},
{
"name": "setting_account_borderRadius",
"value": "16vp"
},
{
"name": "setting_list_height",
"value": "48vp"
},
{
"name": "setting_list_padding",
"value": "4vp"
},
{
"name": "setting_list_borderRadius",
"value": "16vp"
},
{
"name": "setting_list_startMargin",
"value": "42vp"
},
{
"name": "setting_list_endMargin",
"value": "24vp"
},
{
"name": "setting_list_strokeWidth",
"value": "0.25vp"
},
{
"name": "setting_button_bottom",
"value": "55vp"
},
{
"name": "setting_size",
"value": "22vp"
},
{
"name": "setting_padding",
"value": "10vp"
},
{
"name": "setting_jump_width",
"value": "12vp"
},
{
"name": "setting_jump_height",
"value": "24vp"
},
{
"name": "setting_settingCell_left",
"value": "8vp"
},
{
"name": "setting_settingCell_right",
"value": "22vp"
}
]
}
\ No newline at end of file
...@@ -3,6 +3,35 @@ ...@@ -3,6 +3,35 @@
{ {
"name": "page_show", "name": "page_show",
"value": "page from npm package" "value": "page from npm package"
},
{
"name": "wz_out",
"value": "物资出库"
},
{
"name": "wz_in",
"value": "物资入库"
},
{
"name": "wz_exchange",
"value": "物资调号"
},
{
"name": "wz_reverse",
"value": "物资倒库"
},
{
"name": "wz_inv",
"value": "物资盘库"
},
{
"name": "wz_conversion",
"value": "物资换位"
}
,
{
"name": "wz_position",
"value": "物资落位"
} }
] ]
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论