Commit 78c1dc5a authored by caicaicai's avatar caicaicai

修改

parent fff2e154
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<el-table-column prop="name" label="设备名称" align="center"></el-table-column> <el-table-column prop="name" label="设备名称" align="center"></el-table-column>
<el-table-column prop="code" label="设备编码" align="center"></el-table-column> <el-table-column prop="code" label="设备编码" align="center"></el-table-column>
<el-table-column prop="status" label="设备状态" align="center"></el-table-column> <el-table-column prop="status" label="设备状态" align="center"></el-table-column>
<el-table-column prop="number" label="设备账号" align="center"></el-table-column> <el-table-column prop="number" label="通信账号" align="center"></el-table-column>
<el-table-column prop="remarks" label="备注" align="center"></el-table-column> <el-table-column prop="remarks" label="备注" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right"> <el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -65,11 +65,11 @@ ...@@ -65,11 +65,11 @@
<el-option label="故障" value="故障"></el-option> <el-option label="故障" value="故障"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备账号" prop="number"> <el-form-item label="通信账号" prop="number">
<el-input v-model="form.item.number" style="width:280px;" placeholder="请输入设备账号"/> <el-input v-model="form.item.number" style="width:280px;" placeholder="请输入通信账号"/>
</el-form-item> </el-form-item>
<el-form-item label="设备密码" prop="password"> <el-form-item label="通信密码" prop="password">
<el-input v-model="form.item.password" style="width:280px;" show-password placeholder="请输入设备密码"/> <el-input v-model="form.item.password" style="width:280px;" show-password placeholder="请输入通信密码"/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remarks"> <el-form-item label="备注" prop="remarks">
<el-input type="textarea" v-model="form.item.remarks" style="width:280px;"></el-input> <el-input type="textarea" v-model="form.item.remarks" style="width:280px;"></el-input>
......
<template>
<div class="carSpecificInforView" v-if="whetherShow">
</div>
</template>
<script>
import { Tools, HttpReq, CAMap} from '@/assets/js/common.js';
export default {
data() {
return {
whetherShow:false,
}
},
mounted() {
},
methods: {
loadData(){
this.whetherShow = true;
// this.$nextTick(()=>{
// HttpReq.truckDispatching.screenTitleMenuQuery({size:9999,status:1}).then((res) => {
// })
// })
},
},
}
</script>
<style scope>
.carSpecificInforView{
position: absolute;
top: 7vh;
left: 25vw;
width: 23vw;
height: 85vh;
background:no-repeat center center url('~@/assets/images/cutGraph/guzhangshenbankuang1.png');
background-size:100% 100%;
padding: 5px 7px;
box-sizing: border-box;
overflow: hidden;
}
</style>
\ No newline at end of file
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
<carManagement ref="carManagementMethod" v-show="selectModule == 'carManagement'"/> <carManagement ref="carManagementMethod" v-show="selectModule == 'carManagement'"/>
<intelligentSchedul ref="intelligentSchedulMethod" v-show="selectModule == 'intelligentSchedul'"/> <intelligentSchedul ref="intelligentSchedulMethod" v-show="selectModule == 'intelligentSchedul'"/>
<dataAnalysis ref="dataAnalysisMethod" v-show="selectModule == 'dataAnalysis'"/> <dataAnalysis ref="dataAnalysisMethod" v-show="selectModule == 'dataAnalysis'"/>
<carSpecificInfor ref="carSpecificInforMethod" v-show="selectModule == 'carSpecificInfor'"/>
</div> </div>
<div class="carExample" @click="showSpecificInforFn()"> <div class="carExample" @click="showSpecificInforFn()">
<span class="el-icon-s-opportunity"></span> <span class="el-icon-location"></span>
</div> </div>
</div> </div>
</template> </template>
...@@ -36,6 +37,7 @@ import dataScreening from './components/dataScreening/index.vue' //数据总览 ...@@ -36,6 +37,7 @@ import dataScreening from './components/dataScreening/index.vue' //数据总览
import carManagement from './components/carManagement/index.vue' //车辆管理 import carManagement from './components/carManagement/index.vue' //车辆管理
import intelligentSchedul from './components/intelligentSchedul/index.vue' //智能调度 import intelligentSchedul from './components/intelligentSchedul/index.vue' //智能调度
import dataAnalysis from './components/dataAnalysis/index.vue' //数据分析 import dataAnalysis from './components/dataAnalysis/index.vue' //数据分析
import carSpecificInfor from './components/carSpecificInfor/index.vue' //车辆信息弹框
export default { export default {
components: { components: {
...@@ -43,6 +45,7 @@ export default { ...@@ -43,6 +45,7 @@ export default {
carManagement, carManagement,
intelligentSchedul, intelligentSchedul,
dataAnalysis, dataAnalysis,
carSpecificInfor,
}, },
data() { data() {
return { return {
...@@ -102,8 +105,8 @@ export default { ...@@ -102,8 +105,8 @@ export default {
} }
}, },
showSpecificInforFn(){ showSpecificInforFn(){
this.selectModule = ''; this.selectModule = 'carSpecificInfor';
this.$refs.carSpecificInforMethod.loadData();
}, },
//获取当前时间 //获取当前时间
setNowTimes () { setNowTimes () {
......
...@@ -22,8 +22,8 @@ module.exports = { ...@@ -22,8 +22,8 @@ module.exports = {
lintOnSave: process.env.NODE_ENV === 'development', lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false, productionSourceMap: false,
devServer: { devServer: {
host: 'localhost', // 也可以直接写IP地址这样方便真机测试 //host: 'localhost', // 也可以直接写IP地址这样方便真机测试
//host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试 host: '192.168.0.102', // 也可以直接写IP地址这样方便真机测试
port: port, port: port,
open: true, open: true,
overlay: { overlay: {
......
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