Skip to content

J
jump_hm_warehouse
Commit 64951700 by ning
Options

Merge remote-tracking branch 'origin/master'

parents 06200f77 e0811028
正在显示 包含 356 行增加 和 65 行删除
entry/src/main/ets/database/database.ets
...@@ -55,9 +55,10 @@ class Database { ...@@ -55,9 +55,10 @@ class Database {
let list: T[] = [] let list: T[] = []
let obj = { } as T
while (!result.isAtLastRow) { while (!result.isAtLastRow) {
let obj = { } as T
// 3.3.指针移动到下一行 // 3.3.指针移动到下一行
result.goToNextRow() result.goToNextRow()
......
entry/src/main/ets/database/demo.ets
...@@ -17,6 +17,5 @@ export default async function demoSql() { ...@@ -17,6 +17,5 @@ export default async function demoSql() {
// 查询数据 // 查询数据
const querySql = sqlCommon.getGldw({}) const querySql = sqlCommon.getGldw({})
await database.query(querySql, ["guid", "dwfh", "dwdm", "dwxz"], 'TAB_BZGL_KNZY_APP_BGDDW') await database.query(querySql, ["guid", "dwfh", "dwdm", "dwxz"], 'TAB_BZGL_KNZY_APP_BGDDW')
} }
entry/src/main/ets/pages/metailmange/AddConversionPage.ets
...@@ -170,21 +170,28 @@ struct AddConversionPage { ...@@ -170,21 +170,28 @@ struct AddConversionPage {
@Builder WzInfoRow() { @Builder WzInfoRow() {
Flex({ direction: FlexDirection.Column }) { Flex({ direction: FlexDirection.Column }) {
Column() { Column() {
Row() { Flex({justifyContent:FlexAlign.SpaceBetween, alignItems: ItemAlign.Center}){
Divider() Row() {
.vertical(true) Divider()
.height(14) .vertical(true)
.strokeWidth(3) .height(14)
.color('#19ac88') .strokeWidth(3)
.opacity(0.6) .color('#19ac88')
.margin({ left: 8, right: 8 }) .opacity(0.6)
Text("单位/库房信息") .margin({ left: 8, right: 8 })
Text("单位/库房信息")
.fontWeight(FontWeight.Medium)
.fontSize(14)
.fontColor($r("app.color.item_color_black"))
}
.width("40%")
Text("浙江钧普科技股份有限公司1号库房")
.fontWeight(FontWeight.Medium) .fontWeight(FontWeight.Medium)
.fontSize(14) .fontSize(21)
.fontColor($r("app.color.item_color_black")) .fontColor($r("app.color.title_background"))
.width("60%")
}.padding({left:2,bottom:20}) .textAlign(TextAlign.Start)
.width("100%") }.width("100%").padding({left:2,bottom:20})
Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
Row(){ Row(){
Divider() Divider()
...@@ -268,7 +275,7 @@ struct AddConversionPage { ...@@ -268,7 +275,7 @@ struct AddConversionPage {
this.WzInfoRow() this.WzInfoRow()
}.width("100%") }.width("100%")
}.tabBar(this.TabBuilder(1, '物资信息')) }.tabBar(this.TabBuilder(1, '物资信息'))
}.margin({left:15,right:15,top:15}) }.margin({left:10,right:10,top:15})
.onChange((index: number) => { .onChange((index: number) => {
this.currentIndex = index this.currentIndex = index
}) })
......
entry/src/main/ets/pages/metailmange/AddTemporaryInPage.ets
...@@ -205,22 +205,30 @@ export struct AddTemporaryInPage { ...@@ -205,22 +205,30 @@ export struct AddTemporaryInPage {
@Builder WzInfoRow() { @Builder WzInfoRow() {
Flex({ direction: FlexDirection.Column }) { Flex({ direction: FlexDirection.Column }) {
Column() { Column() {
Row() { Flex({justifyContent:FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center}){
Divider() Row() {
.vertical(true) Divider()
.height(14) .vertical(true)
.strokeWidth(3) .height(14)
.color('#19ac88') .strokeWidth(3)
.opacity(0.6) .color('#19ac88')
.margin({ left: 8, right: 8 }) .opacity(0.6)
Text("单位/库房信息") .margin({ left: 8, right: 8 })
Text("单位/库房信息")
.fontWeight(FontWeight.Medium)
.fontSize(14)
.fontColor($r("app.color.item_color_black"))
}
.width("40%")
Text("浙江钧普科技股份有限公司1号库房")
.fontWeight(FontWeight.Medium) .fontWeight(FontWeight.Medium)
.fontSize(14) .fontSize(21)
.fontColor($r("app.color.item_color_black")) .fontColor($r("app.color.title_background"))
}.padding({left:2}) .width("60%")
.width("100%") .textAlign(TextAlign.Start)
.height(40) .padding({left:2,bottom:20})
} }.width("100%")
}.padding({bottom:20,top:20})
.borderRadius(5) .borderRadius(5)
.width("100%") .width("100%")
.backgroundColor("#fff") .backgroundColor("#fff")
......
entry/src/main/ets/pages/metailmange/AddTemporaryOutPage.ets
...@@ -205,26 +205,33 @@ struct AddTemporaryOutPage{ ...@@ -205,26 +205,33 @@ struct AddTemporaryOutPage{
@Builder WzInfoRow() { @Builder WzInfoRow() {
Flex({ direction: FlexDirection.Column }) { Flex({ direction: FlexDirection.Column }) {
Column() { Column() {
Row() { Flex({justifyContent:FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center}){
Divider() Row() {
.vertical(true) Divider()
.height(14) .vertical(true)
.strokeWidth(3) .height(14)
.color('#19ac88') .strokeWidth(3)
.opacity(0.6) .color('#19ac88')
.margin({ left: 8, right: 8 }) .opacity(0.6)
Text("单位/库房信息") .margin({ left: 8, right: 8 })
Text("单位/库房信息")
.fontWeight(FontWeight.Medium)
.fontSize(14)
.fontColor($r("app.color.item_color_black"))
}
.width("40%")
Text("浙江钧普科技股份有限公司1号库房")
.fontWeight(FontWeight.Medium) .fontWeight(FontWeight.Medium)
.fontSize(14) .fontSize(21)
.fontColor($r("app.color.item_color_black")) .fontColor($r("app.color.title_background"))
}.padding({left:2}) .width("60%")
.width("100%") .textAlign(TextAlign.Start)
.height(40) .padding({left:2,bottom:20})
} }.width("100%")
}.padding({bottom:20,top:20})
.borderRadius(5) .borderRadius(5)
.width("100%") .width("100%")
.backgroundColor("#fff") .backgroundColor("#fff")
.backgroundColor("#fff")
Flex({ direction: FlexDirection.Column}) { Flex({ direction: FlexDirection.Column}) {
Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }){ Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }){
Row() { Row() {
......
entry/src/main/ets/pages/sub_systemMaintenance/Feedback.ets 0 → 100644
import { TitleBar } from '../../view/title/TitleBar'
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
.borderColor('#0fa983')
.backgroundColor('#fff')
.fontColor('#0fa983')
.borderRadius(10)
.type(ButtonType.Normal)
.height(50)
.margin(10)
.stateEffect(true)
}
@Entry
@Component
export struct Feedback {
@State rating: number = 3.5
controller: TextAreaController = new TextAreaController()
textInputController: TextInputController = new TextInputController()
build() {
Column() {
Flex({ direction: FlexDirection.Column }) {
TitleBar({ title: "意见反馈" })
Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween }) {
Text('问题和意见').fontColor('#8f8f94').fontSize(16)
Text('快速键入').fontColor('#8f8f94').fontSize(16)
}.padding(8)
TextArea({
placeholder: '请详细描述你的问题和意见...',
controller: this.controller
})
.backgroundColor('#fff')
.width('100%')
.height(104)
.borderRadius(0)
Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween }) {
Text('图片(选填,提供问题截图,总大小10M以下)').fontColor('#8f8f94').fontSize(16)
}.padding(8)
TextArea({
placeholder: '未实现...',
controller: this.controller
})
.backgroundColor('#fff')
.width('100%')
.height(104)
.borderRadius(0)
Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween }) {
Text('手机号/微信/QQ/邮箱').fontColor('#8f8f94').fontSize(16)
}.padding(8)
TextInput({ placeholder: '(选填,方便我们联系你 )', controller: this.textInputController })
.backgroundColor('#fff')
.width('100%')
.borderRadius(0)
Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) {
Text('应用评分').fontColor('#8f8f94').fontSize(16).margin({right: 8})
Rating({ rating: this.rating, indicator: false })
.stars(5)
.stepSize(0.5)
.onChange((value: number) => {
this.rating = value
})
}.padding(8)
Column() {
Button("提交").CommonButtonStyle().width('100%')
}.width('100%').padding({ left: 10, right: 10 })
}
}.linearGradient({
direction: GradientDirection.RightBottom,
repeating: true,
colors: [['#97c6a6', 0.0], ['#e8f5c2', 1.0]]
})
}
}
\ No newline at end of file
entry/src/main/ets/pages/sub_systemMaintenance/General.ets
import { generalInitList, UniListItem } from '@ohos/system/src/main/ets/model/UniInitList' import { generalInitList, scanInitList, systemList, UniListItem } from '@ohos/system/src/main/ets/model/UniInitList'
import { TitleBar } from '../../view/title/TitleBar' import { TitleBar } from '../../view/title/TitleBar'
import { BasicDialog } from '../../view/BasicDialog/BasicDialog' import { BasicDialog } from '../../view/BasicDialog/BasicDialog'
...@@ -16,6 +16,7 @@ import { BasicDialog } from '../../view/BasicDialog/BasicDialog' ...@@ -16,6 +16,7 @@ import { BasicDialog } from '../../view/BasicDialog/BasicDialog'
@Component @Component
export struct General { export struct General {
scroller: Scroller = new Scroller()
dialogController: CustomDialogController = new CustomDialogController({ dialogController: CustomDialogController = new CustomDialogController({
builder: BasicDialog({ builder: BasicDialog({
cancel: this.onCancel, cancel: this.onCancel,
...@@ -44,16 +45,32 @@ export struct General { ...@@ -44,16 +45,32 @@ export struct General {
build() { build() {
Column() { Column() {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.SpaceBetween}) { TitleBar({ title: "设备系统信息" })
TitleBar({ title: "通用" }) Column() {
List() {
Column() { ListItem() {
Row() {
Divider()
.vertical(true)
.height(14)
.strokeWidth(3)
.color('#19ac88')
.opacity(0.6)
.margin({ left: 8, right: 8 })
Text("直连配置")
.fontSize(16)
}
}.height(46)
}
.backgroundColor('#fff')
.width('100%')
Divider().strokeWidth(1).color('rgb(242,242,242)')
List({ space: 2 }) { List({ space: 2 }) {
ForEach(generalInitList, (item: UniListItem) => { ForEach(generalInitList, (item: UniListItem) => {
ListItem() { ListItem() {
Row() { Row() {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) { Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) {
Text(item.title).fontSize(20).fontColor('#3b4144') Text(item.title).fontSize(18).fontColor('#3b4144')
Text(item.description).fontSize(14).fontColor('#999').margin({ top: 3 }) Text(item.description).fontSize(14).fontColor('#999').margin({ top: 3 })
} }
.width('60%') .width('60%')
...@@ -71,7 +88,7 @@ export struct General { ...@@ -71,7 +88,7 @@ export struct General {
.justifyContent(FlexAlign.SpaceBetween) .justifyContent(FlexAlign.SpaceBetween)
.padding({ left: 12, right: 18 }) .padding({ left: 12, right: 18 })
} }
.height('8%') .height(71)
.onClick(() => { .onClick(() => {
if (this.dialogController != undefined) { if (this.dialogController != undefined) {
this.dialogController.open() this.dialogController.open()
...@@ -81,19 +98,128 @@ export struct General { ...@@ -81,19 +98,128 @@ export struct General {
} }
.width('100%') .width('100%')
.backgroundColor('#fff') .backgroundColor('#fff')
.margin({ bottom: 8 })
.divider({ strokeWidth: 1, color: 'rgb(242,242,242)' }) // 每行之间的分界线 .divider({ strokeWidth: 1, color: 'rgb(242,242,242)' }) // 每行之间的分界线
}.margin({ top:5, bottom: 5 })
List() {
ListItem() {
Row() {
Divider()
.vertical(true)
.height(14)
.strokeWidth(3)
.color('#19ac88')
.opacity(0.6)
.margin({ left: 8, right: 8 })
Text("扫描配置")
.fontSize(16)
}
}.height(46)
}
.backgroundColor('#fff')
.width('100%')
Row() { Divider().strokeWidth(1).color('rgb(242,242,242)')
Flex({ justifyContent: FlexAlign.SpaceAround }) { List({ space: 2 }) {
Button("保存").CommonButtonStyle() ForEach(scanInitList, (item: UniListItem) => {
Button("重置").CommonButtonStyle() ListItem() {
Row() {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) {
Text(item.title).fontSize(18).fontColor('#3b4144')
Text(item.description).fontSize(14).fontColor('#999').margin({ top: 3 })
}
.width('60%')
Blank()
.layoutWeight(1)
Text(item.targetValue)
.fontSize(16)
.flexGrow(1)
.align(Alignment.End)
.margin({ right: 8 })
.fontColor('#999')
}
.width('100%')
.justifyContent(FlexAlign.SpaceBetween)
.padding({ left: 12, right: 18 })
}
.height(71)
.onClick(() => {
if (this.dialogController != undefined) {
this.dialogController.open()
}
})
})
} }
}.height(80).backgroundColor('#97c6a6') .width('100%')
.backgroundColor('#fff')
.margin({ bottom: 8 })
.divider({ strokeWidth: 1, color: 'rgb(242,242,242)' }) // 每行之间的分界线
List() {
ListItem() {
Row() {
Divider()
.vertical(true)
.height(14)
.strokeWidth(3)
.color('#19ac88')
.opacity(0.6)
.margin({ left: 8, right: 8 })
Text("系统配置")
.fontSize(16)
}
}.height(46)
}
.backgroundColor('#fff')
.width('100%')
Divider().strokeWidth(1).color('rgb(242,242,242)')
List({ space: 2 }) {
ForEach(systemList, (item: UniListItem) => {
ListItem() {
Row() {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) {
Text(item.title).fontSize(18).fontColor('#3b4144')
Text(item.description).fontSize(14).fontColor('#999').margin({ top: 3 })
}
.width('60%')
Blank()
.layoutWeight(1)
Text(item.targetValue)
.fontSize(16)
.flexGrow(1)
.align(Alignment.End)
.margin({ right: 8 })
.fontColor('#999')
}
.width('100%')
.justifyContent(FlexAlign.SpaceBetween)
.padding({ left: 12, right: 18 })
}
.height(71)
.onClick(() => {
if (this.dialogController != undefined) {
this.dialogController.open()
}
})
})
}
.width('100%')
.backgroundColor('#fff')
.margin({ bottom: 8 })
.divider({ strokeWidth: 1, color: 'rgb(242,242,242)' })
} }
}.linearGradient({ Row() {
Flex({ justifyContent: FlexAlign.SpaceAround }) {
Button("保存").CommonButtonStyle()
Button("重置").CommonButtonStyle()
}
}.height(70).backgroundColor('#97c6a6')
}
.linearGradient({
direction: GradientDirection.RightBottom, direction: GradientDirection.RightBottom,
repeating: true, repeating: true,
colors: [['#97c6a6', 0.0], ['#e8f5c2', 1.0]] colors: [['#97c6a6', 0.0], ['#e8f5c2', 1.0]]
......
entry/src/main/ets/pages/sub_systemMaintenance/Premiere.ets
...@@ -9,7 +9,7 @@ export struct Premiere { ...@@ -9,7 +9,7 @@ export struct Premiere {
TitleBar({ title: "功能介绍" }) TitleBar({ title: "功能介绍" })
Scroll(this.scroller) { Scroll(this.scroller) {
Image($rawfile('system/shuoming.jpg')).width('100%') Image($rawfile('system/shuoming.jpg')).width('100%')
}.scrollBar(BarState.Off).scrollBarWidth(1) // 滚动条宽度 }.scrollBarWidth(1) // 滚动条宽度
}.padding(10) }.padding(10)
.linearGradient({ .linearGradient({
direction: GradientDirection.RightBottom, direction: GradientDirection.RightBottom,
......
entry/src/main/resources/base/profile/main_pages.json
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
"pages/sub_systemMaintenance/BurnerDescription", "pages/sub_systemMaintenance/BurnerDescription",
"pages/sub_systemMaintenance/DeviceInfoPage", "pages/sub_systemMaintenance/DeviceInfoPage",
"pages/sub_systemMaintenance/DataSynchronism/DataSynchronism", "pages/sub_systemMaintenance/DataSynchronism/DataSynchronism",
"pages/sub_systemMaintenance/Version" "pages/sub_systemMaintenance/Version",
"pages/sub_systemMaintenance/Feedback"
] ]
} }
features/SystemMaintenance/src/main/ets/model/UniInitList.ets
...@@ -79,7 +79,7 @@ export const sysExtraInitList: UniListItem[] = [ ...@@ -79,7 +79,7 @@ export const sysExtraInitList: UniListItem[] = [
showExtraIcon: true, showExtraIcon: true,
showArrow: true, showArrow: true,
//extraIcon: '', //extraIcon: '',
url: 'pages/sub_systemMaintenance/General', url: 'pages/sub_systemMaintenance/Feedback',
targetValue: '' targetValue: ''
}, },
{ {
...@@ -179,6 +179,64 @@ export const generalInitList: UniListItem[] = [ ...@@ -179,6 +179,64 @@ export const generalInitList: UniListItem[] = [
description: '模式推送方式' description: '模式推送方式'
}, },
] ]
export const scanInitList: UniListItem[] = [
{
title: '扫描模式',
showExtraIcon: true,
showArrow: true,
//extraIcon: '',
targetValue: '',
description: '直联模式扫描方式'
},
{
title: '扫描读取模式',
showExtraIcon: true,
showArrow: true,
//extraIcon: '',
targetValue: '',
description: '直联模式扫描读取方式'
},
]
export const systemList: UniListItem[] = [
{
title: '主题',
showExtraIcon: true,
showArrow: true,
//extraIcon: '',
targetValue: '',
description: '系统主题信息'
},
{
title: '设备编码',
showExtraIcon: true,
showArrow: true,
//extraIcon: '',
targetValue: '',
description: '机器设备编码'
},
{
title: '授权码',
showExtraIcon: true,
showArrow: true,
//extraIcon: '',
targetValue: '',
description: '系统授权码'
},
{
title: '导入版本号',
showExtraIcon: true,
showArrow: true,
//extraIcon: '',
targetValue: '',
description: '数据导入版本号'
},
]
/*运行的应用设备*/ /*运行的应用设备*/
export const getDeviceList: UniListItem[] = [ export const getDeviceList: UniListItem[] = [
{ {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论