root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
gengby
2022-11-29 17:32:00 +08:00
parent ca02e2998f
commit 90d04a4ae0
2 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
View File

@@ -359,29 +359,20 @@ export default {
return return
} }
for (const val in this.data1) { for (const val in this.data1) {
if (this.data1[val].code.indexOf('mode') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 0)
}
if (this.data1[val].code.indexOf('move') !== -1) { if (this.data1[val].code.indexOf('move') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1) this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
} }
if (this.data1[val].code.indexOf('action') !== -1) { if (this.data1[val].code.indexOf('carrier_direction') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
} }
if (this.data1[val].code.indexOf('ioaction') !== -1) { if (this.data1[val].code.indexOf('error') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3)
}
if (this.data1[val].code.indexOf('height') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4) this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
} }
if (this.data1[val].code.indexOf('error') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5)
}
if (this.data1[val].code.indexOf('direction') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 6)
}
if (this.data1[val].code.indexOf('operation_type') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 7)
}
if (this.data1[val].code.indexOf('task') !== -1) { if (this.data1[val].code.indexOf('task') !== -1) {
this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 21) this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 8)
} }
} }
} }
@@ -400,13 +391,32 @@ export default {
if (isNaN(parseInt(endNumber))) { if (isNaN(parseInt(endNumber))) {
return return
} }
console.log(endNumber)
for (const val in this.data2) { for (const val in this.data2) {
if (this.data2[val].code.indexOf('to_command') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 0)
}
if (this.data2[val].code.indexOf('to_target') !== -1) { if (this.data2[val].code.indexOf('to_target') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
} }
if (this.data2[val].code.indexOf('to_container_type') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
}
if (this.data2[val].code.indexOf('to_task') !== -1) { if (this.data2[val].code.indexOf('to_task') !== -1) {
this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6) this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
} }
if (this.data2[val].code.indexOf('to_strap_times') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 10)
}
if (this.data2[val].code.indexOf('to_length') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 12)
}
if (this.data2[val].code.indexOf('to_weight') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 14)
}
if (this.data2[val].code.indexOf('to_height') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 16)
}
} }
} }
}, },

43
acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
View File

@@ -41,7 +41,7 @@
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
</el-col> </el-col>
<rrOperation/> <rrOperation />
</el-row> </el-row>
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -67,7 +67,7 @@
> >
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item v-if="false" label="路线标识" prop="line_uuid"> <el-form-item v-if="false" label="路线标识" prop="line_uuid">
<el-input v-model="form.line_uuid" style="width: 370px;"/> <el-input v-model="form.line_uuid" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="路由方案" prop="route_plan_id"> <el-form-item label="路由方案" prop="route_plan_id">
@@ -87,12 +87,12 @@
<el-form-item label="当前设备名称" prop="device_code"> <el-form-item label="当前设备名称" prop="device_code">
<el-select <el-select
ref="test"
v-model="form.device_code" v-model="form.device_code"
filterable filterable
ref="test"
clearable clearable
multiple multiple
reserveKeyword reserve-keyword
placeholder="请选择" placeholder="请选择"
style="width: 370px;" style="width: 370px;"
> >
@@ -110,7 +110,7 @@
v-model="form.next_device_code" v-model="form.next_device_code"
filterable filterable
clearable clearable
reserveKeyword reserve-keyword
multiple multiple
placeholder="请选择" placeholder="请选择"
style="width: 370px;" style="width: 370px;"
@@ -139,10 +139,10 @@
</el-form-item> </el-form-item>
<el-form-item label="权值" prop="weights"> <el-form-item label="权值" prop="weights">
<el-input-number v-model="form.weights" :min="1" :max="10" label="描述文字"/> <el-input-number v-model="form.weights" :min="1" :max="10" label="描述文字" />
</el-form-item> </el-form-item>
<el-form-item label="描述信息" prop="description"> <el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 370px;" rows="5" type="textarea"/> <el-input v-model="form.remark" style="width: 370px;" rows="5" type="textarea" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -160,20 +160,20 @@
style="width: 100%;" style="width: 100%;"
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
> >
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="line_uuid" label="路线标识"/> <el-table-column v-if="false" prop="line_uuid" label="路线标识" />
<el-table-column prop="device_code" label="设备编码"/> <el-table-column prop="device_code" label="设备编码" />
<el-table-column v-if="false" prop="device_code" label="设备名称"/> <el-table-column v-if="false" prop="device_code" label="设备名称" />
<el-table-column prop="type" label="路由类型"> <el-table-column prop="type" label="路由类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.type=='0' ">输送路由</span> <span v-if="scope.row.type=='0' ">输送路由</span>
<span v-if="scope.row.type=='1' ">agv路由</span> <span v-if="scope.row.type=='1' ">agv路由</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="next_device_code" min-width="120" label="后置设备号"/> <el-table-column prop="next_device_code" min-width="120" label="后置设备号" />
<el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备名称"/> <el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备名称" />
<el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备类型"/> <el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备类型" />
<el-table-column prop="weights" label="权值"/> <el-table-column prop="weights" label="权值" />
<el-table-column label="是否启用" align="center" prop="is_active"> <el-table-column label="是否启用" align="center" prop="is_active">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -188,8 +188,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="update_by" label="修改者"/> <el-table-column prop="update_by" label="修改者" />
<el-table-column prop="update_time" min-width="160" label="修改时间"/> <el-table-column prop="update_time" min-width="160" label="修改时间" />
<el-table-column <el-table-column
v-permission="['admin','routeLine:edit','routeLine:del']" v-permission="['admin','routeLine:edit','routeLine:del']"
label="操作" label="操作"
@@ -206,7 +206,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination/> <pagination />
</div> </div>
</div> </div>
</template> </template>
@@ -314,6 +314,13 @@ export default {
this.form.next_device_code = Array.of(data.form.next_device_code.split('').join('')) this.form.next_device_code = Array.of(data.form.next_device_code.split('').join(''))
return true return true
}, },
[CRUD.HOOK.beforeSubmit](data) {
if (this.crud.status.edit === 1) {
this.form.device_code = data.form.device_code.join('')
this.form.next_device_code = data.form.next_device_code.join('')
}
return true
},
// 改变状态 // 改变状态
changeEnabled(data) { changeEnabled(data) {
var msg = '停用' var msg = '停用'