Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周远喜
mes-ui
Commits
d5afbeb0
Commit
d5afbeb0
authored
May 06, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设备管理去掉能力值和是否关重
parent
9a19d354
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
32 deletions
+37
-32
newEquipment.vue
...Management/deviceManagementCP/components/newEquipment.vue
+11
-11
index.vue
pages/resourceManagement/deviceManagementCP/index.vue
+26
-21
No files found.
pages/resourceManagement/deviceManagementCP/components/newEquipment.vue
View file @
d5afbeb0
...
...
@@ -55,17 +55,17 @@
<inputFile
ref=
"refqcFile"
v-model=
"imgName"
:parms=
"qcfileparms"
files
/>
</FormItem>
</Col>
<Col
span=
"11"
offset=
"1"
>
<
!--
<
Col
span=
"11"
offset=
"1"
>
<FormItem
label=
"是否关重"
prop=
"isimportant"
>
<Select
v-model=
"isimportant"
>
<Option
:value=
"1"
>
是
</Option>
<Option
:value=
"2"
>
否
</Option>
</Select>
</FormItem>
</Col>
</Col>
-->
</Row>
<Row
:gutter=
"16"
>
<Col
span=
"11"
>
<
!--
<
Col
span=
"11"
>
<FormItem
label=
"能力系数"
>
<InputNumber
:min=
"0"
...
...
@@ -74,7 +74,7 @@
style=
"width:240px"
></InputNumber>
</FormItem>
</Col>
</Col>
-->
<Col
span=
"11"
offset=
"1"
>
<FormItem
label=
"位置"
prop=
"location"
>
<Input
v-model=
"formItem.location"
placeholder=
"请输入位置"
></Input>
...
...
@@ -132,12 +132,12 @@ export default {
equip_ip
:
""
,
shop_id
:
""
,
shop_name
:
""
,
isimportant
:
2
,
//
isimportant: 2,
location
:
""
,
capability_value
:
1
//
capability_value: 1
},
property
:
true
,
isimportant
:
2
,
//
isimportant: 2,
ruleValidate
:
{
equip_id
:
[
{
...
...
@@ -234,9 +234,9 @@ export default {
equip_ip
:
this
.
formItem
.
equip_ip
,
shop_id
:
this
.
formItem
.
shop_id
,
eqstyle
:
str
,
isimportant
:
this
.
isimportant
,
//
isimportant: this.isimportant,
location
:
this
.
formItem
.
location
,
capability_value
:
this
.
formItem
.
capability_value
,
//
capability_value: this.formItem.capability_value,
property
:
this
.
property
,
shop_name
:
this
.
formItem
.
shop_name
};
...
...
@@ -277,9 +277,9 @@ export default {
equip_ip
:
this
.
formItem
.
equip_ip
,
shop_id
:
this
.
formItem
.
shop_id
,
eqstyle
:
str
,
isimportant
:
this
.
isimportant
,
//
isimportant: this.isimportant,
location
:
this
.
formItem
.
location
,
capability_value
:
this
.
formItem
.
capability_value
,
//
capability_value: this.formItem.capability_value,
property
:
this
.
property
,
shop_name
:
this
.
formItem
.
shop_name
};
...
...
pages/resourceManagement/deviceManagementCP/index.vue
View file @
d5afbeb0
...
...
@@ -5,10 +5,12 @@
<h3
class=
"zh-title"
>
组织架构
</h3>
<div
class=
"zh-box"
>
<Input
search
placeholder=
"请输入查询条件"
clearable
v-model=
"treeInputSearch"
/>
<Tree
:data=
"searchList"
:style=
"
{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode">
</Tree>
<Tree
:data=
"searchList"
:style=
"
{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode"
>
</Tree>
</div>
</div>
<!-- 右侧内容 -->
...
...
@@ -535,23 +537,23 @@ export default {
title
:
"所属部门"
,
key
:
"shop_name"
},
{
title
:
"是否关重"
,
key
:
"isimportant"
,
render
:
(
h
,
params
)
=>
{
let
statuse
=
params
.
row
.
isimportant
;
let
text
=
statuse
==
1
?
"是"
:
statuse
==
2
?
"否"
:
""
;
return
h
(
"span"
,
{},
text
);
}
},
//
{
//
title: "是否关重",
//
key: "isimportant",
//
render: (h, params) => {
//
let statuse = params.row.isimportant;
//
let text = statuse == 1 ? "是" : statuse == 2 ? "否" : "";
//
return h("span", {}, text);
//
}
//
},
{
title
:
"位置"
,
key
:
"location"
},
{
title
:
"能力系数"
,
key
:
"capability_value"
},
//
{
//
title: "能力系数",
//
key: "capability_value"
//
},
{
title
:
"操作"
,
key
:
"action"
,
...
...
@@ -577,7 +579,7 @@ export default {
attrs
:
{
oprate
:
"edit"
,
// class: "edit",
title
:
"编辑"
title
:
"编辑"
},
on
:
{
click
:
()
=>
{
...
...
@@ -591,7 +593,8 @@ export default {
"op"
,
{
attrs
:
{
oprate
:
"delete"
,
title
:
"删除"
oprate
:
"delete"
,
title
:
"删除"
},
style
:
{
color
:
"red"
...
...
@@ -608,7 +611,8 @@ export default {
"op"
,
{
attrs
:
{
oprate
:
"detail"
,
title
:
"保养"
oprate
:
"detail"
,
title
:
"保养"
},
on
:
{
click
:
()
=>
{
...
...
@@ -622,7 +626,8 @@ export default {
"op"
,
{
attrs
:
{
oprate
:
"detail"
,
title
:
"维修"
oprate
:
"detail"
,
title
:
"维修"
},
on
:
{
click
:
()
=>
{
...
...
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