|
@@ -27,20 +27,24 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="12">
|
|
|
|
- <el-form-item label="开考时间">
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="startExamDatetimeRange"
|
|
|
|
- class="input"
|
|
|
|
- type="datetimerange"
|
|
|
|
- start-placeholder="开始日期"
|
|
|
|
- range-separator="至"
|
|
|
|
- end-placeholder="结束日期"
|
|
|
|
- value-format="yyyy/MM/dd HH:mm:ss"
|
|
|
|
- :clearable="false"
|
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
+ <el-form-item label="虚拟设备名">
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="form.virtualName"
|
|
|
|
+ class="form_search_width"
|
|
size="small"
|
|
size="small"
|
|
- @change="changeStartExamDatetimeRange"
|
|
|
|
- ></el-date-picker>
|
|
|
|
|
|
+ placeholder="虚拟设备名"
|
|
|
|
+ ></el-input>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="6">
|
|
|
|
+ <el-form-item label="IP">
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="form.ip"
|
|
|
|
+ class="form_search_width"
|
|
|
|
+ size="small"
|
|
|
|
+ placeholder="IP"
|
|
|
|
+ ></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -85,6 +89,24 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
|
|
+ <el-row v-show="showAllCondition">
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="开考时间">
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="startExamDatetimeRange"
|
|
|
|
+ class="input"
|
|
|
|
+ type="datetimerange"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ range-separator="至"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ value-format="yyyy/MM/dd HH:mm:ss"
|
|
|
|
+ :clearable="false"
|
|
|
|
+ size="small"
|
|
|
|
+ @change="changeStartExamDatetimeRange"
|
|
|
|
+ ></el-date-picker>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ </el-row>
|
|
</commonFormVue>
|
|
</commonFormVue>
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<el-button
|
|
<el-button
|
|
@@ -321,6 +343,12 @@
|
|
prop="virtualCameraNames"
|
|
prop="virtualCameraNames"
|
|
width="120"
|
|
width="120"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ sortable
|
|
|
|
+ label="IP"
|
|
|
|
+ prop="ip"
|
|
|
|
+ width="120"
|
|
|
|
+ ></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
sortable
|
|
sortable
|
|
:sort-method="sortByPaperTotalScore"
|
|
:sort-method="sortByPaperTotalScore"
|
|
@@ -572,6 +600,8 @@ export default {
|
|
dialogVisible: false,
|
|
dialogVisible: false,
|
|
// uploadDisabled: true,
|
|
// uploadDisabled: true,
|
|
form: {
|
|
form: {
|
|
|
|
+ virtualName: null,
|
|
|
|
+ ip: null,
|
|
switchScreenCountStart: null,
|
|
switchScreenCountStart: null,
|
|
switchScreenCountEnd: null,
|
|
switchScreenCountEnd: null,
|
|
rootOrgId: null,
|
|
rootOrgId: null,
|
|
@@ -1032,8 +1062,6 @@ export default {
|
|
.el-date-editor.el-input__inner {
|
|
.el-date-editor.el-input__inner {
|
|
width: auto !important;
|
|
width: auto !important;
|
|
}
|
|
}
|
|
-.upload-demo {
|
|
|
|
-}
|
|
|
|
.disabled .el-upload--picture-card {
|
|
.disabled .el-upload--picture-card {
|
|
display: none;
|
|
display: none;
|
|
}
|
|
}
|