|
|
@@ -33,10 +33,6 @@
|
|
|
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
|
|
v-hasPermi="['manage:orderConfig:export']">导出</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="analysisDialog=true"
|
|
|
- v-hasPermi="['manage:orderConfig:export']">自定义分析</el-button>
|
|
|
- </el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -52,12 +48,6 @@
|
|
|
<el-table-column label="架次" align="center" prop="sortie" />
|
|
|
<el-table-column label="步长" align="center" prop="step" />
|
|
|
<el-table-column label="指令描述" align="center" prop="description" />
|
|
|
- <!-- <el-table-column label="创建人" align="center" prop="createBy" />
|
|
|
- <el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
<el-table-column label="更新人" align="center" prop="updateBy" />
|
|
|
<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -89,11 +79,12 @@
|
|
|
:value="dict"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="指令类型" prop="type">
|
|
|
- <el-input v-model="form.type" :disabled="true" />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="架次" prop="sortie">
|
|
|
- <el-input v-model="form.sortie" placeholder="请输入架次" />
|
|
|
+ <el-select v-model="form.sortie" allow-create filterable placeholder="请选择架次" style="width:100%">
|
|
|
+ <el-option v-for="(item, index) in sortieArr" :key="index" :label="item.sortieNumber"
|
|
|
+ :value="item.sortieNumber"></el-option>
|
|
|
+ </el-select>
|
|
|
+ <!-- <el-input v-model="form.sortie" placeholder="请输入架次" /> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="步长" prop="step">
|
|
|
<el-input v-model="form.step" placeholder="请输入步长" />
|
|
|
@@ -111,10 +102,6 @@
|
|
|
<el-dialog :title="title" :visible.sync="openXml" :close-on-click-modal="false" width="900px" append-to-body>
|
|
|
<Editor :textContent='xmlText' :dataType='"XML"' v-if="openXml"/>
|
|
|
</el-dialog>
|
|
|
- <!-- 自定义分析的对话框 -->
|
|
|
- <el-dialog title="分析页面" :visible.sync="analysisDialog" width="27%" :show-close='false'>
|
|
|
- <faultAnalysis :flag="flag" :close='close'/>
|
|
|
- </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -126,14 +113,13 @@ import {
|
|
|
addOrderConfig,
|
|
|
updateOrderConfig,
|
|
|
getOrderConfigXml,
|
|
|
+ listSortie,
|
|
|
} from '@/api/manage/orderConfig'
|
|
|
import Editor from '@/views/manage/instructionInfo/Editor'
|
|
|
-import faultAnalysis from '@/views/manage/faultAnalysis'
|
|
|
export default {
|
|
|
name: 'OrderConfig',
|
|
|
components: {
|
|
|
- Editor,
|
|
|
- faultAnalysis
|
|
|
+ Editor
|
|
|
},
|
|
|
dicts: ['order_type'],
|
|
|
data() {
|
|
|
@@ -185,6 +171,8 @@ export default {
|
|
|
analysisDialog:false,
|
|
|
//1是自定义的，0是列表信息进入的
|
|
|
flag:1,
|
|
|
+ // 架次下拉框
|
|
|
+ sortieArr: []
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -245,6 +233,7 @@ export default {
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
this.reset()
|
|
|
+ this.findListSortie()
|
|
|
this.open = true
|
|
|
this.title = '添加指令配置'
|
|
|
},
|
|
|
@@ -256,6 +245,13 @@ export default {
|
|
|
this.form = response.data
|
|
|
this.open = true
|
|
|
this.title = '修改指令配置'
|
|
|
+ this.findListSortie()
|
|
|
+ })
|
|
|
+ },
|
|
|
+ findListSortie() {
|
|
|
+ listSortie({}).then(response => {
|
|
|
+ this.sortieArr = response.data
|
|
|
+ console.log(response);
|
|
|
})
|
|
|
},
|
|
|
/** 查询 */
|
