Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -217,9 +217,6 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content bg-purple-light" />
|
||||
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y">
|
||||
<el-select
|
||||
v-model="form.from_y"
|
||||
@@ -301,45 +298,113 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="起点2" prop="start_point_code2">-->
|
||||
<!-- <el-select-->
|
||||
<!-- v-model="form.start_point_code2"-->
|
||||
<!-- style="width: 370px;"-->
|
||||
<!-- filterable-->
|
||||
<!-- placeholder="请选择"-->
|
||||
<!-- >-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in deviceList"-->
|
||||
<!-- :key="item.device_code"-->
|
||||
<!-- :label="item.device_code"-->
|
||||
<!-- :value="item.device_code"-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="终点2" prop="next_point_code2">-->
|
||||
<!-- <el-select-->
|
||||
<!-- v-model="form.next_point_code2"-->
|
||||
<!-- style="width: 370px;"-->
|
||||
<!-- filterable-->
|
||||
<!-- placeholder="请选择"-->
|
||||
<!-- >-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in deviceList"-->
|
||||
<!-- :key="item.device_code"-->
|
||||
<!-- :label="item.device_code"-->
|
||||
<!-- :value="item.device_code"-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content bg-purple-light" />
|
||||
<el-form-item :label="$t('task.select.Start_point2')" prop="start_point_code2">
|
||||
<el-select
|
||||
v-model="form.start_point_code2"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in deviceList"
|
||||
:key="item.device_code"
|
||||
:label="item.device_code"
|
||||
:value="item.device_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y2">
|
||||
<el-select
|
||||
v-model="form.from_y2"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
@change="isDisabled=false"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in fromYList"
|
||||
:key="item.id"
|
||||
:label="item.value"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_layer')" prop="from_z2">
|
||||
<el-select
|
||||
v-model="form.from_z2"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
@change="isDisabled=false"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in fromZList"
|
||||
:key="item.id"
|
||||
:label="item.value"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('task.select.Destination2')" prop="next_point_code2">
|
||||
<el-select
|
||||
v-model="form.next_point_code2"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in deviceList"
|
||||
:key="item.device_code"
|
||||
:label="item.device_code"
|
||||
:value="item.device_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="end_flag" :label="$t('task.select.Ending_column')" prop="to_y2">
|
||||
<el-select
|
||||
v-model="form.to_y2"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
@change="isDisabled=false"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in toYList"
|
||||
:key="item.id"
|
||||
:label="item.value"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="end_flag" :label="$t('task.select.Ending_layer')" prop="to_z2">
|
||||
<el-select
|
||||
v-model="form.to_z2"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
@change="isDisabled=false"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in toZList"
|
||||
:key="item.id"
|
||||
:label="item.value"
|
||||
:value="item.id"
|
||||
@change="isDisabled=false"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('task.txt_box.Priority')">
|
||||
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
|
||||
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
|
||||
</el-form-item>
|
||||
<el-form-item label="扩展字段">
|
||||
<el-form-item :label="$t('task.txt_box.extension_field')">
|
||||
<div>
|
||||
<el-button @click="openDialog">请选择</el-button>
|
||||
<el-button @click="openDialog">{{ $t('task.select.Placeholder') }}</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('task.select.Description')" prop="description">
|
||||
@@ -353,7 +418,7 @@
|
||||
<el-button :loading="crud.cu === 2" :disabled="isDisabled" type="primary" @click="saveBtn">{{ $t('task.select.Confirm') }}</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog :visible.sync="dialogVisible" title="扩展字段" @close="closeDialog">
|
||||
<el-dialog :visible.sync="dialogVisible" :title="$t('task.txt_box.extension_field')" @close="closeDialog">
|
||||
<el-form>
|
||||
<el-form-item>
|
||||
<el-button v-if="showAddRowButton" style="color: #6b75e9;" @click="addNewRow">添加新行</el-button>
|
||||
@@ -617,7 +682,14 @@ export default {
|
||||
to_x: null,
|
||||
to_y: null,
|
||||
to_z: null,
|
||||
agv_system_type: '1'
|
||||
from_x2: null,
|
||||
from_y2: null,
|
||||
from_z2: null,
|
||||
to_x2: null,
|
||||
to_y2: null,
|
||||
to_z2: null,
|
||||
agv_system_type: '1',
|
||||
interaction_json: {}
|
||||
},
|
||||
extension: [{
|
||||
name: '',
|
||||
@@ -679,10 +751,10 @@ export default {
|
||||
saveForm() {
|
||||
// 保存表单数据
|
||||
// 你可以在这里处理保存逻辑，并发送请求保存表单数据
|
||||
this.extension.reduce((form, item) => {
|
||||
form[item.name] = item.value
|
||||
return form
|
||||
}, this.form)
|
||||
this.form.interaction_json = this.extension.reduce((extension, item) => {
|
||||
extension[item.name] = item.value
|
||||
return extension
|
||||
}, {})
|
||||
this.dialogVisible = false
|
||||
},
|
||||
saveBtn() {
|
||||
|
||||
Reference in New Issue
Block a user