Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
template_vue
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
杨硕
template_vue
Commits
cc5d1f59
Commit
cc5d1f59
authored
Aug 05, 2023
by
CenXinYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改ESlint问题
Signed-off-by:
CenXinYi
<
2810162984@qq.com
>
parent
03dd356b
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
208 additions
and
225 deletions
+208
-225
application.vue
src/views/equipment/application.vue
+9
-9
boundManagement.vue
src/views/equipment/boundManagement.vue
+1
-1
check.vue
src/views/equipment/check.vue
+85
-91
checkProcess.vue
src/views/equipment/checkProcess.vue
+5
-6
equipmentAbandonment.vue
src/views/equipment/equipmentAbandonment.vue
+82
-91
management.vue
src/views/equipment/management.vue
+3
-3
processEquipment.vue
src/views/equipment/processEquipment.vue
+2
-2
index.vue
src/views/processManagement/deviceReuse/index.vue
+3
-3
index.vue
src/views/processManagement/equipmentRequisition/index.vue
+1
-2
index.vue
src/views/sample/basicInformation/index.vue
+1
-1
index.vue
src/views/sample/correctionLibrary/index.vue
+1
-1
index.vue
src/views/sample/sampleType/index.vue
+15
-15
No files found.
src/views/equipment/application.vue
View file @
cc5d1f59
...
@@ -10,14 +10,14 @@
...
@@ -10,14 +10,14 @@
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"phd"
style=
"flex-basis: 50%;"
prop=
"phd"
>
<el-form-item
label=
"phd"
style=
"flex-basis: 50%;"
prop=
"phd"
>
<el-input
ref=
"input2"
v-model=
"form.phd"
placeholder=
"请输入phd"
:style=
"
{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
<el-input
ref=
"input2"
v-model=
"form.phd"
placeholder=
"请输入phd"
:style=
"
{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row
:gutter=
"40"
>
<el-row
:gutter=
"40"
>
<el-col
:span=
"12"
style=
"padding-left: 16%;"
>
<el-col
:span=
"12"
style=
"padding-left: 16%;"
>
<el-form-item
label=
"prank"
style=
"flex-basis: 50%;"
prop=
"prank"
>
<el-form-item
label=
"prank"
style=
"flex-basis: 50%;"
prop=
"prank"
>
<el-input
ref=
"input3"
v-model=
"form.prank"
placeholder=
"请输入prank"
:style=
"
{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
<el-input
ref=
"input3"
v-model=
"form.prank"
placeholder=
"请输入prank"
:style=
"
{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
...
@@ -74,11 +74,6 @@ import { getDictData, addApplication } from '@/api/equipment/application'
...
@@ -74,11 +74,6 @@ import { getDictData, addApplication } from '@/api/equipment/application'
export
default
{
export
default
{
name
:
'Role'
,
name
:
'Role'
,
mounted
()
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
input1
.
$refs
.
input
.
focus
()
})
},
data
()
{
data
()
{
return
{
return
{
form
:
{
form
:
{
...
@@ -90,8 +85,8 @@ export default {
...
@@ -90,8 +85,8 @@ export default {
},
},
rule
:
{
rule
:
{
pn
:
[{
required
:
true
,
message
:
'请输入pn'
,
trigger
:
'blur'
}],
pn
:
[{
required
:
true
,
message
:
'请输入pn'
,
trigger
:
'blur'
}],
phd
:
[{
required
:
true
,
pattern
:
/^
\d
+$/
,
message
:
'仅能输入整数'
,
trigger
:
'blur'
}],
phd
:
[{
required
:
true
,
pattern
:
/^
\d
+$/
,
message
:
'仅能输入整数'
,
trigger
:
'blur'
}],
prank
:
[{
required
:
true
,
pattern
:
/^
\d
+$/
,
message
:
'仅能输入整数'
,
trigger
:
'blur'
}],
prank
:
[{
required
:
true
,
pattern
:
/^
\d
+$/
,
message
:
'仅能输入整数'
,
trigger
:
'blur'
}],
pgx
:
[{
required
:
true
,
message
:
'请输入pgx'
,
trigger
:
'blur'
}],
pgx
:
[{
required
:
true
,
message
:
'请输入pgx'
,
trigger
:
'blur'
}],
pissb
:
[{
required
:
true
,
message
:
'请输入pissb'
,
trigger
:
'blur'
}],
pissb
:
[{
required
:
true
,
message
:
'请输入pissb'
,
trigger
:
'blur'
}],
pnumber
:
[{
required
:
true
,
message
:
'请输入pnumber'
,
trigger
:
'blur'
}]
pnumber
:
[{
required
:
true
,
message
:
'请输入pnumber'
,
trigger
:
'blur'
}]
...
@@ -109,6 +104,11 @@ export default {
...
@@ -109,6 +104,11 @@ export default {
]
]
}
}
},
},
mounted
()
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
input1
.
$refs
.
input
.
focus
()
})
},
created
()
{
created
()
{
this
.
init
()
this
.
init
()
},
},
...
...
src/views/equipment/boundManagement.vue
View file @
cc5d1f59
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
<!-- 添加或修改设备配置对话框 -->
<!-- 添加或修改设备配置对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"500px"
append-to-body
:close-on-click-modal=
"false"
>
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"500px"
append-to-body
:close-on-click-modal=
"false"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
size=
"small"
label-width=
"100px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
size=
"small"
label-width=
"100px"
>
<el-form-item
label=
"pn"
prop=
"pn"
>
<el-form-item
label=
"pn"
prop=
"pn"
>
<el-input
ref=
"input1"
v-model
.
trim=
"form.pn"
:maxlength=
"30"
placeholder=
"请输入pn"
@
keyup
.
enter
.
native=
"handelTab(1,$event)"
/>
<el-input
ref=
"input1"
v-model
.
trim=
"form.pn"
:maxlength=
"30"
placeholder=
"请输入pn"
@
keyup
.
enter
.
native=
"handelTab(1,$event)"
/>
</el-form-item>
</el-form-item>
...
...
src/views/equipment/check.vue
View file @
cc5d1f59
This diff is collapsed.
Click to expand it.
src/views/equipment/checkProcess.vue
View file @
cc5d1f59
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
</div>
</div>
</el-dialog>
</el-dialog>
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<el-dialog
class=
"aboutSingleDetails"
:title=
"title"
:visible
.
sync=
"openDetails"
width=
"700px"
append-to-body
:close-on-click-modal=
"false"
>
<el-dialog
class=
"aboutSingleDetails"
:title=
"title"
:visible
.
sync=
"openDetails"
width=
"700px"
append-to-body
:close-on-click-modal=
"false"
>
<el-form
ref=
"formDetails"
:model=
"singleDetails"
size=
"small"
label-width=
"90px"
>
<el-form
ref=
"formDetails"
:model=
"singleDetails"
size=
"small"
label-width=
"90px"
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
...
@@ -216,7 +216,7 @@
...
@@ -216,7 +216,7 @@
:visible
.
sync=
"table"
:visible
.
sync=
"table"
direction=
"rtl"
direction=
"rtl"
size=
"50%"
size=
"50%"
:close-on-click-modal=
"false"
:close-on-click-modal=
"false"
>
>
<el-table
v-loading=
"loading"
border
:data=
"tableList"
style=
"padding: 0 10px;"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
border
:data=
"tableList"
style=
"padding: 0 10px;"
@
selection-change=
"handleSelectionChange"
>
...
@@ -377,10 +377,9 @@ export default {
...
@@ -377,10 +377,9 @@ export default {
// 查询参数
// 查询参数
queryParams
:
{
queryParams
:
{
page
:
1
,
page
:
1
,
rows
:
10
,
rows
:
10
,
ptype
:
2
,
ptype
:
2
,
pstatus
:
0
,
pstatus
:
0
},
},
// 表单参数
// 表单参数
...
@@ -666,7 +665,7 @@ export default {
...
@@ -666,7 +665,7 @@ export default {
page
:
1
,
page
:
1
,
rows
:
10
,
rows
:
10
,
ptype
:
2
,
ptype
:
2
,
pstatus
:
0
pstatus
:
0
}
}
this
.
resetForm
(
'queryForm'
)
this
.
resetForm
(
'queryForm'
)
this
.
handleQuery
()
this
.
handleQuery
()
...
...
src/views/equipment/equipmentAbandonment.vue
View file @
cc5d1f59
This diff is collapsed.
Click to expand it.
src/views/equipment/management.vue
View file @
cc5d1f59
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
<div
class=
"placeholder"
/>
<div
class=
"placeholder"
/>
<div
style=
"padding:5px 10px"
>
<div
style=
"padding:5px 10px"
>
<div
class=
"mb12 font-small-bold"
>
设备管理列表
</div>
<div
class=
"mb12 font-small-bold"
>
设备管理列表
</div>
<el-table
v-loading=
"loading"
border
:data=
"equipmentList"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
border
:data=
"equipmentList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"80"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"80"
/>
<el-table-column
label=
"pn"
prop=
"businessId"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"pn"
prop=
"businessId"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
{{
scope
.
row
.
createName
||
'-'
}}
{{
scope
.
row
.
createName
||
'-'
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"操作时间"
:show-overflow-tooltip=
"true"
align=
"center"
prop=
"updateDate"
>
<el-table-column
label=
"操作时间"
:show-overflow-tooltip=
"true"
align=
"center"
prop=
"updateDate"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
updateDate
|
transformDateByFormat
(
'YYYY-MM-DD HH:mm'
)
}}
</span>
<span>
{{
scope
.
row
.
updateDate
|
transformDateByFormat
(
'YYYY-MM-DD HH:mm'
)
}}
</span>
</
template
>
</
template
>
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
<!-- 添加或修改设备配置对话框 -->
<!-- 添加或修改设备配置对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"500px"
append-to-body
:close-on-click-modal=
"false"
>
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"500px"
append-to-body
:close-on-click-modal=
"false"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
size=
"small"
label-width=
"100px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
size=
"small"
label-width=
"100px"
>
<el-form-item
label=
"pn"
prop=
"pn"
>
<el-form-item
label=
"pn"
prop=
"pn"
>
<el-input
ref=
"input1"
v-model
.
trim=
"form.pn"
:maxlength=
"100"
placeholder=
"请输入pn"
@
keyup
.
enter
.
native=
"handelTab(1,$event)"
/>
<el-input
ref=
"input1"
v-model
.
trim=
"form.pn"
:maxlength=
"100"
placeholder=
"请输入pn"
@
keyup
.
enter
.
native=
"handelTab(1,$event)"
/>
</el-form-item>
</el-form-item>
...
...
src/views/equipment/processEquipment.vue
View file @
cc5d1f59
...
@@ -141,8 +141,8 @@ import {
...
@@ -141,8 +141,8 @@ import {
listRole
,
listRole
,
updateRole
updateRole
}
from
'@/api/system/role'
}
from
'@/api/system/role'
import
{
roleMenuTreeselect
,
roleMenuTreeselectMC
,
treeselect
as
menuTreeselect
}
from
'@/api/system/menu'
import
{
roleMenuTreeselect
,
roleMenuTreeselectMC
,
treeselect
as
menuTreeselect
}
from
'@/api/system/menu'
import
{
roleDeptTreeselect
,
treeselect
as
deptTreeselect
}
from
'@/api/system/dept'
import
{
roleDeptTreeselect
,
treeselect
as
deptTreeselect
}
from
'@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export
default
{
export
default
{
name
:
'Role'
,
name
:
'Role'
,
...
...
src/views/processManagement/deviceReuse/index.vue
View file @
cc5d1f59
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<!-- 表单区域-->
<!-- 表单区域-->
<el-form
ref=
"form"
:model=
"form"
:rules=
"rule"
label-width=
"80px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rule"
label-width=
"80px"
>
<!-- 标题-->
<!-- 标题-->
<div
class=
"info"
><span
class=
"title"
>
再利用
</span></div>
<div
class=
"info"
><span
class=
"title"
>
再利用
</span></div>
<el-row
:gutter=
"40"
>
<el-row
:gutter=
"40"
>
<el-col
:span=
"12"
style=
"padding-left: 10%;"
>
<el-col
:span=
"12"
style=
"padding-left: 10%;"
>
...
...
src/views/processManagement/equipmentRequisition/index.vue
View file @
cc5d1f59
...
@@ -434,8 +434,7 @@ export default {
...
@@ -434,8 +434,7 @@ export default {
}
}
}
}
})
})
},
}
}
}
}
}
...
...
src/views/sample/basicInformation/index.vue
View file @
cc5d1f59
...
@@ -172,7 +172,7 @@ export default {
...
@@ -172,7 +172,7 @@ export default {
rules
:
{
rules
:
{
pn
:
[{
required
:
true
,
message
:
'请输入pn'
,
trigger
:
'blur'
}
],
pn
:
[{
required
:
true
,
message
:
'请输入pn'
,
trigger
:
'blur'
}
],
name
:
[{
required
:
true
,
message
:
'请输入name'
,
trigger
:
'blur'
}
],
name
:
[{
required
:
true
,
message
:
'请输入name'
,
trigger
:
'blur'
}
],
qty
:
[{
required
:
true
,
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
],
qty
:
[{
required
:
true
,
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
],
maxQty
:
[{
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
],
maxQty
:
[{
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
],
minQty
:
[{
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
]
minQty
:
[{
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
]
}
,
}
,
...
...
src/views/sample/correctionLibrary/index.vue
View file @
cc5d1f59
...
@@ -154,7 +154,7 @@ export default {
...
@@ -154,7 +154,7 @@ export default {
rules
:
{
rules
:
{
pn
:
[{
required
:
true
,
message
:
'请输入pn'
,
trigger
:
'blur'
}
],
pn
:
[{
required
:
true
,
message
:
'请输入pn'
,
trigger
:
'blur'
}
],
name
:
[{
required
:
true
,
message
:
'请输入name'
,
trigger
:
'blur'
}
],
name
:
[{
required
:
true
,
message
:
'请输入name'
,
trigger
:
'blur'
}
],
qty
:
[{
required
:
true
,
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
],
qty
:
[{
required
:
true
,
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
],
maxQty
:
[{
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
],
maxQty
:
[{
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
],
minQty
:
[{
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
]
minQty
:
[{
pattern
:
/^
[
0-9
]
{1,9
}
(\.[
0-9
]
{1,3
}
)?
$/
,
message
:
'仅能输入数字和小数,限制三位小数'
,
trigger
:
'change'
}
]
}
,
}
,
...
...
src/views/sample/sampleType/index.vue
View file @
cc5d1f59
...
@@ -46,13 +46,13 @@
...
@@ -46,13 +46,13 @@
icon=
"el-icon-plus"
icon=
"el-icon-plus"
@
click=
"handleAdd"
@
click=
"handleAdd"
>
新增
</el-button>
>
新增
</el-button>
<!--
<el-button-->
<!--
<el-button-->
<!-- style="padding: 8px 7px;"-->
<!-- style="padding: 8px 7px;"-->
<!-- type="success"-->
<!-- type="success"-->
<!-- size="small"-->
<!-- size="small"-->
<!-- icon="el-icon-download"-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"-->
<!-- @click="handleExport"-->
<!-- >导出
</el-button>
-->
<!-- >导出
</el-button>
-->
</el-form-item>
</el-form-item>
</div>
</div>
</el-form>
</el-form>
...
@@ -78,11 +78,11 @@
...
@@ -78,11 +78,11 @@
{{
scope
.
row
.
dno
||
'-'
}}
{{
scope
.
row
.
dno
||
'-'
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<!-- <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
label=
"操作人"
prop=
"createName"
:show-overflow-tooltip=
"true"
width=
"200px"
>
<el-table-column
label=
"操作人"
prop=
"createName"
:show-overflow-tooltip=
"true"
width=
"200px"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
createName
||
'-'
}}
{{
scope
.
row
.
createName
||
'-'
}}
...
@@ -138,9 +138,9 @@
...
@@ -138,9 +138,9 @@
<
el
-
form
-
item
label
=
"dno"
prop
=
"dno"
>
<
el
-
form
-
item
label
=
"dno"
prop
=
"dno"
>
<
el
-
input
v
-
model
.
trim
=
"form.dno"
clearable
:
maxlength
=
"100"
placeholder
=
"请输入dno"
/>
<
el
-
input
v
-
model
.
trim
=
"form.dno"
clearable
:
maxlength
=
"100"
placeholder
=
"请输入dno"
/>
<
/el-form-item
>
<
/el-form-item
>
<!--
<
el
-
form
-
item
label
=
"remarks"
prop
=
"remarks"
>-->
<!--
<
el
-
form
-
item
label
=
"remarks"
prop
=
"remarks"
>-->
<!--
<
el
-
input
v
-
model
.
trim
=
"form.remarks"
:
maxlength
=
"30"
placeholder
=
"请输入remarks"
/>-->
<!--
<
el
-
input
v
-
model
.
trim
=
"form.remarks"
:
maxlength
=
"30"
placeholder
=
"请输入remarks"
/>-->
<!--
<
/el-form-item>--
>
<!--
<
/el-form-item>--
>
<
/el-form
>
<
/el-form
>
<
div
slot
=
"footer"
class
=
"dialog-footer"
>
<
div
slot
=
"footer"
class
=
"dialog-footer"
>
<
el
-
button
@
click
=
"cancel"
>
取
消
<
/el-button
>
<
el
-
button
@
click
=
"cancel"
>
取
消
<
/el-button
>
...
...
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