Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m14s
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m14s
This commit is contained in:
commit
5cf57c4d2f
@ -29,7 +29,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-collapse>
|
</el-collapse>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="联机" name="second">
|
<el-tab-pane v-if="canLiji" label="联机" name="second">
|
||||||
<el-form ref="ruleForm" v-loading="loading" :model="ruleForm" :rules="rules" label-width="100px">
|
<el-form ref="ruleForm" v-loading="loading" :model="ruleForm" :rules="rules" label-width="100px">
|
||||||
<el-form-item label="仿真号" prop="inputGroup">
|
<el-form-item label="仿真号" prop="inputGroup">
|
||||||
<el-input v-model="ruleForm.inputGroup" placeholder="请输入仿真号" style="width: 200px;" />
|
<el-input v-model="ruleForm.inputGroup" placeholder="请输入仿真号" style="width: 200px;" />
|
||||||
@ -68,6 +68,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
loading: false,
|
loading: false,
|
||||||
param: '',
|
param: '',
|
||||||
|
canLiji: false,
|
||||||
collapse: '1',
|
collapse: '1',
|
||||||
subsetList: [],
|
subsetList: [],
|
||||||
subsetMap: {},
|
subsetMap: {},
|
||||||
@ -307,7 +308,11 @@ export default {
|
|||||||
initMapSystem() {
|
initMapSystem() {
|
||||||
queryMapFunctionList({mapId: this.$route.params.mapId, detail: true}).then(resp => {
|
queryMapFunctionList({mapId: this.$route.params.mapId, detail: true}).then(resp => {
|
||||||
this.systemList = resp.data;
|
this.systemList = resp.data;
|
||||||
|
this.canLiji = false;
|
||||||
this.systemList.forEach(item => {
|
this.systemList.forEach(item => {
|
||||||
|
if (item.name === '综合演练') {
|
||||||
|
this.canLiji = true;
|
||||||
|
}
|
||||||
if (item.subset && this.subsetList.includes(item.subset) && item.name !== '实训室') {
|
if (item.subset && this.subsetList.includes(item.subset) && item.name !== '实训室') {
|
||||||
this.subsetMap[item.subset].push(item);
|
this.subsetMap[item.subset].push(item);
|
||||||
} else if (item.subset && item.name !== '实训室') {
|
} else if (item.subset && item.name !== '实训室') {
|
||||||
|
Loading…
Reference in New Issue
Block a user