Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
Starter Web Vue
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
product
kim3-web-vue
Starter Web Vue
Commits
775f2127
Commit
775f2127
authored
Aug 02, 2021
by
shuiluo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 设备管理国际化优化
parent
a2d69b3f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
13 deletions
+14
-13
src/components/FormMixin/index.js
src/components/FormMixin/index.js
+3
-3
src/pages/oceanus/equipment/Left/TreeModal.vue
src/pages/oceanus/equipment/Left/TreeModal.vue
+1
-1
src/pages/oceanus/equipment/Right/EventDrawer.vue
src/pages/oceanus/equipment/Right/EventDrawer.vue
+10
-9
No files found.
src/components/FormMixin/index.js
View file @
775f2127
...
@@ -31,11 +31,11 @@ export default {
...
@@ -31,11 +31,11 @@ export default {
this
.
form
=
{
...
data
};
this
.
form
=
{
...
data
};
this
.
type
=
type
;
this
.
type
=
type
;
if
(
type
===
0
)
{
if
(
type
===
0
)
{
this
.
title
=
'
新增
'
;
this
.
title
=
this
.
$t
(
'
table.add
'
)
;
}
else
if
(
type
===
1
)
{
}
else
if
(
type
===
1
)
{
this
.
title
=
'
编辑
'
;
this
.
title
=
this
.
$t
(
'
table.edit
'
)
;
}
else
if
(
type
===
2
)
{
}
else
if
(
type
===
2
)
{
this
.
title
=
'
查看
'
;
this
.
title
=
this
.
$t
(
'
table.view
'
)
;
}
else
{
}
else
{
this
.
title
=
''
;
this
.
title
=
''
;
}
}
...
...
src/pages/oceanus/equipment/Left/TreeModal.vue
View file @
775f2127
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
@
cancel=
"close"
@
cancel=
"close"
>
>
<a-form-model
layout=
"vertical"
:model=
"form"
:rules=
"rules"
ref=
"DrawerForm"
>
<a-form-model
layout=
"vertical"
:model=
"form"
:rules=
"rules"
ref=
"DrawerForm"
>
<a-form-model-item
:label=
"$t('system.organizatio')"
prop=
"catalogValue"
>
<a-form-model-item
:label=
"$t('system.organizatio
n
')"
prop=
"catalogValue"
>
<OrganizationTree
v-model=
"form.catalogValue"
:disabled=
"isView"
/>
<OrganizationTree
v-model=
"form.catalogValue"
:disabled=
"isView"
/>
</a-form-model-item>
</a-form-model-item>
</a-form-model>
</a-form-model>
...
...
src/pages/oceanus/equipment/Right/EventDrawer.vue
View file @
775f2127
...
@@ -2,7 +2,12 @@
...
@@ -2,7 +2,12 @@
<Drawer
ref=
"drawerRef"
v-model=
"visible"
:title=
"title"
:onOk=
"submit"
:colesAfter=
"colesAfter"
>
<Drawer
ref=
"drawerRef"
v-model=
"visible"
:title=
"title"
:onOk=
"submit"
:colesAfter=
"colesAfter"
>
<a-form-model
layout=
"vertical"
:model=
"form"
:rules=
"rules"
ref=
"DrawerForm"
>
<a-form-model
layout=
"vertical"
:model=
"form"
:rules=
"rules"
ref=
"DrawerForm"
>
<a-form-model-item
:label=
"$t('oc.equipmentCode')"
prop=
"equipmentId"
>
<a-form-model-item
:label=
"$t('oc.equipmentCode')"
prop=
"equipmentId"
>
<a-select
v-model=
"form.equipmentId"
:disabled=
"true"
:options=
"options"
/>
<a-select
v-model=
"form.equipmentId"
:disabled=
"true"
:options=
"options"
:placeholder=
"$t('select.placeholder')"
/>
</a-form-model-item>
</a-form-model-item>
<a-form-model-item
:label=
"$t('log.eventType')"
prop=
"eventType"
>
<a-form-model-item
:label=
"$t('log.eventType')"
prop=
"eventType"
>
<MySelect
<MySelect
...
@@ -53,9 +58,7 @@ export default {
...
@@ -53,9 +58,7 @@ export default {
watch
:
{
watch
:
{
dataInfo
:
{
dataInfo
:
{
handler
(
val
)
{
handler
(
val
)
{
console
.
log
(
val
);
const
{
catalogName
,
equipmentId
}
=
val
;
const
{
catalogName
,
equipmentId
}
=
val
;
this
.
options
=
[{
value
:
equipmentId
,
label
:
catalogName
,
key
:
equipmentId
}];
this
.
options
=
[{
value
:
equipmentId
,
label
:
catalogName
,
key
:
equipmentId
}];
},
},
deep
:
true
,
deep
:
true
,
...
@@ -67,12 +70,10 @@ export default {
...
@@ -67,12 +70,10 @@ export default {
visible
:
false
,
visible
:
false
,
form
:
{},
form
:
{},
rules
:
{
rules
:
{
equipmentId
:
[{
required
:
true
,
message
:
'
Please select Activity zone
'
,
trigger
:
'
change
'
}],
equipmentId
:
[{
required
:
true
,
message
:
this
.
$t
(
'
select.placeholder
'
),
trigger
:
'
change
'
}],
eventType
:
[{
required
:
true
,
message
:
'
Please select Activity zone
'
,
trigger
:
'
change
'
}],
eventType
:
[{
required
:
true
,
message
:
this
.
$t
(
'
select.placeholder
'
),
trigger
:
'
change
'
}],
occurTime
:
[{
required
:
true
,
message
:
'
Please select Activity zone
'
,
trigger
:
'
change
'
}],
occurTime
:
[{
required
:
true
,
message
:
this
.
$t
(
'
select.placeholder
'
),
trigger
:
'
change
'
}],
eventDescription
:
[
eventDescription
:
[{
required
:
true
,
message
:
this
.
$t
(
'
input.error
'
),
trigger
:
'
change
'
}],
{
required
:
true
,
message
:
'
Please select Activity zone
'
,
trigger
:
'
change
'
},
],
},
},
options
:
[],
options
:
[],
getStaticDataApi
,
getStaticDataApi
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment