Commit 1e86a8f2 authored by caicaicai's avatar caicaicai

修改

parent e04d6258
......@@ -2,10 +2,10 @@ ENV = 'development'
# 接口地址
#VUE_APP_BASE_API = 'http://localhost:8000'
VUE_APP_BASE_API = 'http://8.143.203.103:9090'
VUE_APP_BASE_API = 'http://192.168.0.110:8001'
VUE_APP_WS_API = 'ws://8.143.203.103:9090/webSocket'
VUE_APP_LOCAL_API = 'http://8.143.203.103:9090'
VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9090'
VUE_APP_LOCAL_API = 'http://192.168.0.110:8001'
VUE_APP_LOCAL_API2 = 'http://192.168.0.110:8001'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true
......@@ -396,6 +396,14 @@ var HttpReq = function(){
params:param,
})
},
//车辆管理——选择配对的终端设备
selectZhongDuanDeviceQuery: function(param){
return request({
url: '/api/Equipment/use',
method: 'get',
params:param,
})
},
//车辆管理——故障类型管理
carFaultTypeQuery: function(param){
return request({
......
......@@ -13,7 +13,8 @@ const whiteList = ['/login', '/register','/selectSystem'] // no redirect whiteli
router.beforeEach((to, from, next) => {
if (to.meta.title) {
document.title = to.meta.title + ' - ' + Config.title
//document.title = to.meta.title + ' - ' + Config.title
document.title = to.meta.title
}
NProgress.start()
if (getToken()) {
......
......@@ -2,7 +2,7 @@ module.exports = {
/**
* @description 网站标题
*/
title: 'EL-ADMIN',
title: '卡车调度系统',
/**
* @description 是否显示 tagsView
*/
......
......@@ -106,7 +106,7 @@
<el-date-picker v-model="form.item.time" type="date" placeholder="选择日期" style="width:160px;"></el-date-picker>
</el-form-item>
<el-form-item label="终端设备名称" prop="equipmentName">
<el-select v-model="form.item.equipmentName" placeholder="请选择终端设备" style="width:160px;">
<el-select v-model="form.item.equipmentName" placeholder="请选择终端设备" style="width:200px;">
<el-option v-for="(obj,index) in terminalList" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select>
</el-form-item>
......@@ -156,7 +156,6 @@ export default {
}
},
mounted() {
var that = this;
this.$nextTick(() => {
this.loadData();
})
......@@ -185,10 +184,8 @@ export default {
}
})
//获取终端信息
HttpReq.truckDispatching.deviceManagementQuery({size:9999}).then((res) => {
if(res.code == 200){
this.terminalList = res.data.content;
}
HttpReq.truckDispatching.selectZhongDuanDeviceQuery({size:9999}).then((res) => {
this.terminalList = res;
})
//获取车辆类型
HttpReq.truckDispatching.carTypeQuery({size:9999}).then((res) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment