wangs
/
wenZhouGuoJI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新

master
gengby 2 years ago
parent
0d51c4229f
commit
08819a253a
4 changed files with 47 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      acs/nladmin-system/src/main/resources/config/application-dev.yml
  2. 2
      acs/nladmin-ui/src/App.vue
  3. 14
      acs/nladmin-ui/src/views/acs/instruction/index.vue
  4. 74
      acs/nladmin-ui/src/views/acs/task/index.vue

4
acs/nladmin-system/src/main/resources/config/application-dev.yml
View File

@ -13,11 +13,11 @@ spring:
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wzgj_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root} username: ${DB_USER:root}
# password: ${DB_PWD:P@ssw0rd} # password: ${DB_PWD:P@ssw0rd}
# password: ${DB_PWD:Root.123456} # password: ${DB_PWD:Root.123456}
password: ${DB_PWD:123456} password: ${DB_PWD:password}
# 初始连接数 # 初始连接数
initial-size: 5 initial-size: 5

2
acs/nladmin-ui/src/App.vue
View File

@ -24,7 +24,7 @@ export default {
this.timmer = setTimeout(() => { this.timmer = setTimeout(() => {
sessionStorage.clear() sessionStorage.clear()
this.logout() this.logout()
}, 1000 * 60 * 60) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456 }, 100000 * 60 * 60) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
}, },
logout() { logout() {
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {

14
acs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@ -143,12 +143,12 @@
<span v-if="scope.row.send_status=='2' ">失败</span> <span v-if="scope.row.send_status=='2' ">失败</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="start_point_code" label="取货点1" /> <el-table-column prop="start_point_code" label="取货点" />
<el-table-column prop="next_point_code" label="放货点1" /> <el-table-column prop="next_point_code" label="放货点" />
<el-table-column prop="start_point_code2" label="取货点2" /> <!-- <el-table-column prop="start_point_code2" label="取货点2" />-->
<el-table-column prop="next_point_code2" label="放货点2" /> <!-- <el-table-column prop="next_point_code2" label="放货点2" />-->
<el-table-column prop="put_point_code" label="倒料点" /> <el-table-column prop="put_point_code" label="倒料点" />
<el-table-column prop="execute_device_code" label="当前执行设备" /> <el-table-column prop="execute_device_code" label="当前执行设备" width="130" />
<el-table-column prop="carno" label="车号" /> <el-table-column prop="carno" label="车号" />
<!-- <el-table-column prop="compound_inst" label="复合指令">--> <!-- <el-table-column prop="compound_inst" label="复合指令">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
@ -157,8 +157,8 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="compound_inst_data" width="200" label="复合路线" />--> <!-- <el-table-column prop="compound_inst_data" width="200" label="复合路线" />-->
<!-- <el-table-column prop="matarial" label="物料" />--> <!-- <el-table-column prop="matarial" label="物料" />-->
<!-- <el-table-column prop="quantity" label="数量" />--> <!-- <el-table-column prop="quantity" label="数量" />-->
<el-table-column prop="remark" label="描述" /> <el-table-column prop="remark" label="描述" />
<el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" /> <el-table-column prop="create_time" label="创建时间" width="135" />

74
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@ -276,36 +276,36 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="起点2" prop="start_point_code2"> <!-- <el-form-item label="起点2" prop="start_point_code2">-->
<el-select <!-- <el-select-->
v-model="form.start_point_code2" <!-- v-model="form.start_point_code2"-->
style="width: 370px;" <!-- style="width: 370px;"-->
filterable <!-- filterable-->
placeholder="请选择" <!-- placeholder="请选择"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in deviceList" <!-- v-for="item in deviceList"-->
:key="item.device_code" <!-- :key="item.device_code"-->
:label="item.device_code" <!-- :label="item.device_code"-->
:value="item.device_code" <!-- :value="item.device_code"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="终点2" prop="next_point_code2"> <!-- <el-form-item label="终点2" prop="next_point_code2">-->
<el-select <!-- <el-select-->
v-model="form.next_point_code2" <!-- v-model="form.next_point_code2"-->
style="width: 370px;" <!-- style="width: 370px;"-->
filterable <!-- filterable-->
placeholder="请选择" <!-- placeholder="请选择"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in deviceList" <!-- v-for="item in deviceList"-->
:key="item.device_code" <!-- :key="item.device_code"-->
:label="item.device_code" <!-- :label="item.device_code"-->
:value="item.device_code" <!-- :value="item.device_code"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="优先级"> <el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" /> <el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
</el-form-item> </el-form-item>
@ -333,7 +333,7 @@
</el-table-column> </el-table-column>
<!-- <el-table-column prop="link_num" label="关联编号" />--> <!-- <el-table-column prop="link_num" label="关联编号" />-->
<el-table-column prop="vehicle_code" label="载具号" width="100" /> <el-table-column prop="vehicle_code" label="载具号" width="100" />
<el-table-column prop="task_status" label="任务状态" width="60"> <el-table-column prop="task_status" label="任务状态" width="100">
<template slot-scope="scope" width="60"> <template slot-scope="scope" width="60">
<span v-if="scope.row.task_status==='0' ">就绪</span> <span v-if="scope.row.task_status==='0' ">就绪</span>
<span v-if="scope.row.task_status==='1' ">执行中</span> <span v-if="scope.row.task_status==='1' ">执行中</span>
@ -341,11 +341,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="priority" label="优先级" width="100" /> <el-table-column prop="priority" label="优先级" width="100" />
<el-table-column prop="start_point_code" label="取货点1" width="100px" /> <el-table-column prop="start_point_code" label="取货点" width="100px" />
<!-- <el-table-column prop="put_point_code" label="倒料点" width="100" />--> <!-- <el-table-column prop="put_point_code" label="倒料点" width="100" />-->
<el-table-column prop="next_point_code" label="放货点1" width="120px" /> <el-table-column prop="next_point_code" label="放货点" width="120px" />
<el-table-column prop="start_point_code2" label="取货点2" width="120px" /> <!-- <el-table-column prop="start_point_code2" label="取货点2" width="120px" />-->
<el-table-column prop="next_point_code2" label="放货点2" width="120px" /> <!-- <el-table-column prop="next_point_code2" label="放货点2" width="120px" />-->
<!-- <el-table-column prop="compound_task" label="复合任务">--> <!-- <el-table-column prop="compound_task" label="复合任务">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.compound_task==='0' ">否</span>--> <!-- <span v-if="scope.row.compound_task==='0' ">否</span>-->
@ -353,8 +353,8 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />--> <!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
<!-- <el-table-column prop="matarial" label="物料" />--> <!-- <el-table-column prop="matarial" label="物料" />-->
<!-- <el-table-column prop="quantity" label="数量" />--> <!-- <el-table-column prop="quantity" label="数量" />-->
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" /> <el-table-column prop="create_time" label="创建时间" width="135" />

Write Preview
Loading…
Cancel
Save