Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
intelligent_station_web
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
张伯涛
intelligent_station_web
Commits
f00c3a54
Commit
f00c3a54
authored
Aug 30, 2024
by
hubaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
必填和学生信息列表中的班级回显问题
parent
cdb989a6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
95 additions
and
23 deletions
+95
-23
busClassesInfo.js
src/api/busClassesInfo.js
+7
-0
index.vue
src/views/busStudentInfo/index.vue
+10
-22
index.vue
src/views/resContainerInstance/index.vue
+33
-0
index.vue
src/views/resHost/index.vue
+24
-1
index.vue
src/views/resQuotaTemplate/index.vue
+21
-0
No files found.
src/api/busClassesInfo.js
View file @
f00c3a54
...
...
@@ -20,6 +20,13 @@ export function listBusClassesInfo(query) {
})
}
export
function
listBusClassesAllInfo
(
query
)
{
return
request
({
url
:
'/busclassesinfo/listAll'
,
method
:
'get'
,
params
:
query
})
}
// 2. 查询班级信息详细信息
export
function
getBusClassesInfo
(
businessId
)
{
return
request
({
...
...
src/views/busStudentInfo/index.vue
View file @
f00c3a54
...
...
@@ -123,7 +123,7 @@
</el-table-column>
<el-table-column
label=
"班级"
prop=
"classesId"
:show-overflow-tooltip=
"true"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
classesId
||
'-'
}}
{{
getClassesName
(
scope
.
row
.
classesId
)
}}
</
template
>
</el-table-column>
<el-table-column
width=
"80"
label=
"状态"
prop=
"flag"
>
...
...
@@ -224,9 +224,8 @@ import {
delBusStudentInfo
,
addBusStudentInfo
,
updateBusStudentInfo
,
testDataTransfer
,
exportBusStudentInfo
}
from
'@/api/busStudentInfo'
import
{
listBusClassesInfo
}
from
'@/api/busClassesInfo'
import
{
listBusClasses
All
Info
}
from
'@/api/busClassesInfo'
import
commonField
from
'@/utils/commonField'
// import { get } from 'js-cookie'
export
default
{
...
...
@@ -290,16 +289,7 @@ export default {
]
},
// 班级参数
classData
:
[
// { id: 1, name: '软件工程1班' },
// { id: 2, name: '软件工程2班' },
// { id: 3, name: '软件工程3班' },
// { id: 4, name: '软件工程4班' },
// { id: 5, name: '物联网工程1班' },
// { id: 6, name: '物联网工程2班' },
// { id: 7, name: '物联网工程3班' },
// { id: 8, name: '物联网工程4班' }
]
classData
:
[]
}
},
/** 手机号校验*/
...
...
@@ -319,12 +309,17 @@ export default {
methods
:
{
// 查询班级列表
getClassList
()
{
listBusClassesInfo
().
then
(
listBusClasses
All
Info
().
then
(
response
=>
{
this
.
classData
=
response
.
rows
this
.
classData
=
response
.
data
}
)
},
// 根据返回来的classesId查询班级名称
getClassesName
(
id
)
{
const
classesItem
=
this
.
classData
.
find
(
item
=>
item
.
businessId
===
id
)
return
classesItem
?
classesItem
.
classesName
:
'-'
},
// 手机号校验
isStuPhoneValid
(
rule
,
value
,
callback
)
{
const
reg_tel
=
/^
(
13
[
0-9
]
|14
[
01456879
]
|15
[
0-35-9
]
|16
[
2567
]
|17
[
0-8
]
|18
[
0-9
]
|19
[
0-35-9
])\d{8}
$/
...
...
@@ -350,13 +345,6 @@ export default {
this
.
open
=
false
this
.
reset
()
},
// 数据传输
test
()
{
const
code
=
'lvWpJfxYt67CA29WH76ZROY2LrdISOuoTjtFO/AB3CU2n2iqZGkmBzrdQQa5+FBPLDE0g3Apk3j36v2BPYRuig==rzYgX+1HznI8Un1vaebOgfyD0JKMwBvw1AHcr22BjZp1+Kyd+/5LxW0gSiHvgwWr3pYoVC7FcrR7/Fkg/D8byg==gAy7HMu68q3flqoglmX65Pk2SkeHPp36sv8kXMAJKKSBlTLEA2D7FbQvm2Pog/mPh6OKK+ixj+DF3/oBquweYA==bAEXqVoLbIkZ0YYn9d7SOF9zMEWheZXuCV7QqxbzN3VQ1mB/cqZlLGZqogYirSy7kLD86KoEA1/+gu6yRJTFtQ==FKQf9cmpaHHVMPngkDK/0TvP9j4YrOwm1MQxc5TMzHT2XdNCXkw5FgSilzx+DeHuWZjoxmTXYQD48tsVyxRFFA=='
testDataTransfer
(
code
).
then
(
res
=>
{
// 测试
})
},
// 表单重置
reset
()
{
this
.
form
=
{
...
...
src/views/resContainerInstance/index.vue
View file @
f00c3a54
...
...
@@ -416,6 +416,39 @@ export default {
form
:
{},
// 表单校验
rules
:
{
dockerName
:
[
{
required
:
true
,
message
:
'容器名称不能为空'
,
trigger
:
'blur'
}
],
dockerStatus
:
[
{
required
:
true
,
message
:
'容器状态不能为空'
,
trigger
:
'blur'
}
],
dockerLabel
:
[
{
required
:
true
,
message
:
'容器标签不能为空'
,
trigger
:
'blur'
}
],
dockerUserId
:
[
{
required
:
true
,
message
:
'容器负责人不能为空'
,
trigger
:
'blur'
}
],
dockerTemplateId
:
[
{
required
:
true
,
message
:
'容器限额模版不能为空'
,
trigger
:
'blur'
}
],
dockerHostId
:
[
{
required
:
true
,
message
:
'容器宿主机不能为空'
,
trigger
:
'blur'
}
],
dockerCpu
:
[
{
required
:
true
,
message
:
'CPU不能为空'
,
trigger
:
'blur'
}
],
dockerMemory
:
[
{
required
:
true
,
message
:
'内存不能为空'
,
trigger
:
'blur'
}
],
dockerDisk
:
[
{
required
:
true
,
message
:
'硬盘不能为空'
,
trigger
:
'blur'
}
],
dockerImageId
:
[
{
required
:
true
,
message
:
'容器镜像不能为空'
,
trigger
:
'blur'
}
],
dockerGpu
:
[
{
required
:
true
,
message
:
'GPU不能为空'
,
trigger
:
'blur'
}
]
},
// 容器限额,容器实例数据的CPU等值不能超过对应容器模版限额
quotaValue
:
{
...
...
src/views/resHost/index.vue
View file @
f00c3a54
...
...
@@ -325,7 +325,30 @@ export default {
// 表单参数
form
:
{},
// 表单校验
rules
:
{
rules
:
{
hostName
:
[
{
required
:
true
,
message
:
'宿主机名称不能为空'
,
trigger
:
'blur'
}
],
hostStatus
:
[
{
required
:
true
,
message
:
'宿主机状态不能为空'
,
trigger
:
'blur'
}
],
hostCpu
:
[
{
required
:
true
,
message
:
'cpu不能为空'
,
trigger
:
'blur'
}
],
hostMemory
:
[
{
required
:
true
,
message
:
'memory不能为空'
,
trigger
:
'blur'
}
],
hostDisk
:
[
{
required
:
true
,
message
:
'disk不能为空'
,
trigger
:
'blur'
}
],
hostGpu
:
[
{
required
:
true
,
message
:
'gpu不能为空'
,
trigger
:
'blur'
}
],
hostIp
:
[
{
required
:
true
,
message
:
'宿主机ip不能为空'
,
trigger
:
'blur'
}
],
hostContainerInstanceNum
:
[
{
required
:
true
,
message
:
'实例数量不能为空'
,
trigger
:
'blur'
}
]
}
}
},
...
...
src/views/resQuotaTemplate/index.vue
View file @
f00c3a54
...
...
@@ -281,6 +281,27 @@ export default {
form
:
{},
// 表单校验
rules
:
{
quotaName
:
[
{
required
:
true
,
message
:
'限额模版名称不能为空'
,
trigger
:
'blur'
}
],
quotaCpuSum
:
[
{
required
:
true
,
message
:
'cpu限额不能为空'
,
trigger
:
'blur'
}
],
quotaMemorySum
:
[
{
required
:
true
,
message
:
'内存限额不能为空'
,
trigger
:
'blur'
}
],
quotaDiskSum
:
[
{
required
:
true
,
message
:
'硬盘限额不能为空'
,
trigger
:
'blur'
}
],
quotaGpuSum
:
[
{
required
:
true
,
message
:
'gpu限额不能为空'
,
trigger
:
'blur'
}
],
quotaContainerSum
:
[
{
required
:
true
,
message
:
'容器数量限额不能为空'
,
trigger
:
'blur'
}
],
weight
:
[
{
required
:
true
,
message
:
'权重不能为空'
,
trigger
:
'blur'
}
]
}
}
},
...
...
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