Skip to content

卡
卡车调度系统
Commit 8f806e82 authored by caicaicai's avatar caicaicai
Browse files
Options

修改

parent 23fc09ef
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 46 deletions
src/views/DeviceManage/callPolice/index.vue
View file @ 8f806e82
<template> <template>
<div class="common-page device-manage"> <div class="common-page device-manage">
<div class="option page-row">
<!--工具栏-->
<div class="head-container">
<label class="el-form-item-label" style="font-weight: 500;">车牌号</label>
<el-input v-model="query.number" clearable size="small" placeholder="请输入车牌号" style="width:180px;"/>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div>
</div>
<!-- 表格 --> <!-- 表格 -->
<div class="panel-bottom page-row"> <div class="panel-bottom page-row">
<h3>报警管理</h3> <h3>报警管理</h3>
...@@ -12,16 +24,18 @@ ...@@ -12,16 +24,18 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="id" label="序号" align="center"></el-table-column> <el-table-column prop="number" label="车牌号" align="center"></el-table-column>
<el-table-column prop="createTime" label="报警时间" align="center"></el-table-column> <el-table-column prop="createTime" label="报警时间" align="center"></el-table-column>
<el-table-column prop="alarmclass" label="报警类型" align="center"></el-table-column> <el-table-column prop="alarmclass" label="报警类型" align="center"></el-table-column>
<el-table-column prop="alarmexplain" label="报警说明" align="center"></el-table-column>
<el-table-column prop="updateBy" label="处理人" align="center"></el-table-column>
<el-table-column prop="updateTime" label="处理时间" align="center"></el-table-column>
<el-table-column label="解除报警" align="center"> <el-table-column label="解除报警" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" @click="toRelieveAlarm(scope.row)" v-if="scope.row.status == 1">解除报警</el-button> <el-button size="mini" type="primary" @click="toRelieveAlarm(scope.row)" v-if="scope.row.status == 1">解除报警</el-button>
<span v-if="scope.row.status == 0">已解除报警</span> <span v-if="scope.row.status == 0">已解除报警</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="alarmexplain" 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">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button> <el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button>
...@@ -142,6 +156,16 @@ export default { ...@@ -142,6 +156,16 @@ export default {
cancelForm(a, b, c){ cancelForm(a, b, c){
this.form.visible = false; this.form.visible = false;
}, },
// 点击搜索
toSearch() {
this.page = 1;
this.loadData();
},
// 重置搜索
clearLimit(){
this.query = {};
this.loadData()
},
toAdd() { toAdd() {
// 请除表单验证 // 请除表单验证
this.$refs['form1'] && this.$refs['form1'].clearValidate(); this.$refs['form1'] && this.$refs['form1'].clearValidate();
......
src/views/DeviceManage/deviceMan/index.vue
View file @ 8f806e82
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
<div class="option page-row"> <div class="option page-row">
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<!-- 搜索 -->
<!-- <label class="el-form-item-label" style="font-weight: 500;">终端车辆类型</label>
<el-select v-model="query.carclass" placeholder="请选择终端车辆类型" style="width:180px;">
<el-option label="卡车" value="卡车"></el-option>
<el-option label="电铲" value="电铲"></el-option>
</el-select> -->
<label class="el-form-item-label" style="font-weight: 500;">设备编码</label> <label class="el-form-item-label" style="font-weight: 500;">设备编码</label>
<el-input v-model="query.name" clearable size="small" placeholder="请输入设备编码" style="width:180px;"/> <el-input v-model="query.name" clearable size="small" placeholder="请输入设备编码" style="width:180px;"/>
...@@ -30,7 +24,7 @@ ...@@ -30,7 +24,7 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<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="status" label="设备状态" align="center"></el-table-column> <el-table-column prop="status" label="设备状态" align="center"></el-table-column>
<el-table-column prop="carclass" label="车辆类型" align="center"></el-table-column> <el-table-column prop="carclass" 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>
...@@ -52,8 +46,8 @@ ...@@ -52,8 +46,8 @@
<!-- 表单渲染 --> <!-- 表单渲染 -->
<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px"> <el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px">
<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px"> <el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
<el-form-item label="设备名称" prop="name"> <el-form-item label="设备编码" prop="name">
<el-input v-model="form.item.name" style="width:280px;" placeholder="请输入设备名称"/> <el-input v-model="form.item.name" style="width:280px;" placeholder="请输入设备编码"/>
</el-form-item> </el-form-item>
<el-form-item label="设备状态" prop="status"> <el-form-item label="设备状态" prop="status">
<el-select v-model="form.item.status" placeholder="请选择设备状态" style="width:280px;"> <el-select v-model="form.item.status" placeholder="请选择设备状态" style="width:280px;">
......
src/views/IntelligentDispatchManagement/IntelligentDispatch/index.vue
View file @ 8f806e82
...@@ -76,10 +76,10 @@ export default { ...@@ -76,10 +76,10 @@ export default {
} }
}, },
mounted() { mounted() {
var that = this; // var that = this;
this.$nextTick(() => { // this.$nextTick(() => {
this.loadData(); // this.loadData();
}) // })
}, },
methods: { methods: {
loadData() { loadData() {
......
src/views/carManagement/carRepair/index.vue
View file @ 8f806e82
...@@ -34,8 +34,10 @@ ...@@ -34,8 +34,10 @@
<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="driver" label="司机" align="center"></el-table-column> <el-table-column prop="driver" label="司机" align="center"></el-table-column>
<el-table-column prop="carrepair" label="检修类型" align="center"></el-table-column> <el-table-column prop="carrepair" label="检修类型" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
<el-table-column prop="cardescribe" label="检修保养说明" align="center"></el-table-column> <el-table-column prop="cardescribe" label="检修保养说明" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
<el-table-column prop="gongsi" label="维修公司" align="center"></el-table-column>
<el-table-column prop="weixiu" 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">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button> <el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button>
...@@ -73,6 +75,12 @@ ...@@ -73,6 +75,12 @@
<el-form-item label="检修保养说明" prop="cardescribe"> <el-form-item label="检修保养说明" prop="cardescribe">
<el-input v-model="form.item.cardescribe" style="width:280px;" placeholder="请输入检修保养说明"/> <el-input v-model="form.item.cardescribe" style="width:280px;" placeholder="请输入检修保养说明"/>
</el-form-item> </el-form-item>
<el-form-item label="维修公司" prop="gongsi">
<el-input v-model="form.item.gongsi" style="width:280px;" placeholder="请输入维修公司"/>
</el-form-item>
<el-form-item label="维修人" prop="weixiu">
<el-input v-model="form.item.weixiu" style="width:280px;" placeholder="请输入维修人"/>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancelForm">取消</el-button> <el-button type="text" @click="cancelForm">取消</el-button>
......
src/views/productionPlanManagement/productionPlan/index.vue
View file @ 8f806e82
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="month" label="生产计划月份" align="center" :formatter="changeTimeFormat"></el-table-column> <el-table-column prop="month" label="生产计划月份" align="center" :formatter="changeTimeFormat"></el-table-column>
<el-table-column prop="plan" label="预计总计划量" align="center"></el-table-column> <el-table-column prop="plan" label="预计总计划量(T)" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column> <el-table-column prop="createTime" 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">
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px"> <el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px">
<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px"> <el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
<el-form-item label="生产计划月份" prop="month"> <el-form-item label="生产计划月份" prop="month">
<el-date-picker v-model="form.item.month" type="month" placeholder="选择月" style="width:280px;"></el-date-picker> <el-date-picker v-model="form.item.month" type="month" placeholder="选择月份" style="width:280px;"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="总计划量(kg)" prop="plan"> <el-form-item label="总计划量(T)" prop="plan">
<el-input v-model="form.item.plan" style="width:280px;" placeholder="请输入总计划量(kg)"/> <el-input v-model="form.item.plan" style="width:280px;" placeholder="请输入总计划量(T)"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
</div> </div>
<el-table :data="gridData" border v-loading="gradeLoading"> <el-table :data="gridData" border v-loading="gradeLoading">
<el-table-column property="name" label="采区名称" align="center"></el-table-column> <el-table-column property="name" label="采区名称" align="center"></el-table-column>
<el-table-column property="plan" label="计划量(kg)" align="center"></el-table-column> <el-table-column property="plan" label="计划量(T)" align="center"></el-table-column>
<el-table-column property="mean" label="平均日产量(kg)" align="center"></el-table-column> <el-table-column property="mean" label="平均日产量(T)" align="center"></el-table-column>
<el-table-column property="total" label="累计完成量(kg)" align="center"></el-table-column> <el-table-column property="total" label="累计完成量(T)" align="center"></el-table-column>
<el-table-column property="ratio" label="完成率(%)" align="center"></el-table-column> <el-table-column property="ratio" 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">
...@@ -76,11 +76,11 @@ ...@@ -76,11 +76,11 @@
<el-option v-for="(obj,index) in RegionalTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option> <el-option v-for="(obj,index) in RegionalTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="计划量(kg)"> <el-form-item label="计划量(T)">
<el-input v-model="gradeFrom.item.plan" style="width:260px;" placeholder="请输入计划量(kg)"></el-input> <el-input v-model="gradeFrom.item.plan" style="width:260px;" placeholder="请输入计划量(T)"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="累计完成量(kg)"> <el-form-item label="累计完成量(T)">
<el-input v-model="gradeFrom.item.total" style="width:260px;" placeholder="请输入累计完成量(kg)"></el-input> <el-input v-model="gradeFrom.item.total" style="width:260px;" placeholder="请输入累计完成量(T)"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -118,9 +118,9 @@ export default { ...@@ -118,9 +118,9 @@ export default {
item:{}, item:{},
}, },
rules: { rules: {
// time: [ month: [
// {required: true, message: '请输入区域信息', trigger: 'blur' } {required: true, message: '请选择月份', trigger: 'change' }
// ], ],
}, },
......
src/views/regionalManagement/regionalInformation/index.vue
View file @ 8f806e82
...@@ -62,16 +62,10 @@ ...@@ -62,16 +62,10 @@
<el-form-item label="最大承接车辆数" prop="max"> <el-form-item label="最大承接车辆数" prop="max">
<el-input v-model="form.item.max" style="width:160px;" placeholder="请输入最大承接车辆数"/> <el-input v-model="form.item.max" style="width:160px;" placeholder="请输入最大承接车辆数"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="区域中心坐标点" prop="coordinate">
<el-input v-model="form.item.coordinate" style="width:160px;" placeholder="请输入区域中心坐标点"/>
</el-form-item> -->
<el-form-item label="区域标记"> <el-form-item label="区域标记">
<el-input v-model="picFileName" style="width:160px;" placeholder="请选择图片" disabled /> <el-input v-model="picFileName" style="width:160px;" placeholder="请选择图片" disabled />
<input type="file" name="image" @change="excelImport($event)" /> <input type="file" name="image" @change="excelImport($event)" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="区域范围或直径" prop="arearange">
<el-input v-model="form.item.arearange" style="width:160px;" placeholder="请输入区域范围或直径"/>
</el-form-item> -->
<el-form-item label="电铲名称" prop="areashovel"> <el-form-item label="电铲名称" prop="areashovel">
<el-input v-model="form.item.areashovel" style="width:160px;" placeholder="请输入电铲名称"/> <el-input v-model="form.item.areashovel" style="width:160px;" placeholder="请输入电铲名称"/>
</el-form-item> </el-form-item>
...@@ -90,9 +84,9 @@ ...@@ -90,9 +84,9 @@
<el-form-item label="优先级" prop="areapriority"> <el-form-item label="优先级" prop="areapriority">
<el-input-number v-model="form.item.areapriority" :min="1" :max="10" label=""></el-input-number> <el-input-number v-model="form.item.areapriority" :min="1" :max="10" label=""></el-input-number>
</el-form-item> </el-form-item>
<div id="centerDiv" class="mapcontainer3" v-show="form.reqType == 'add'"> <!-- <div id="centerDiv" class="mapcontainer3" v-show="form.reqType == 'add'">
<mars3dViewerMap :url="configUrl" @onload="onMapload" ref="mars3dViewerMapMethod"/> <mars3dViewerMap :url="configUrl" @onload="onMapload" ref="mars3dViewerMapMethod"/>
</div> </div> -->
<!-- 如果所属类型是电子围栏，要添加一下属性 --> <!-- 如果所属类型是电子围栏，要添加一下属性 -->
......
src/views/regionalManagement/regionalType/index.vue
View file @ 8f806e82
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="code" label="区域编码" align="center"></el-table-column> <el-table-column prop="classname" label="区域类别名称" align="center"></el-table-column>
<el-table-column prop="classname" label="类别名称" align="center"></el-table-column>
<el-table-column prop="color" label="区域遮罩层颜色" align="center"></el-table-column> <el-table-column prop="color" label="区域遮罩层颜色" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column> <el-table-column prop="createTime" label="日期" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right"> <el-table-column label="操作" align="center" fixed="right">
...@@ -34,14 +33,16 @@ ...@@ -34,14 +33,16 @@
<!-- 表单渲染 --> <!-- 表单渲染 -->
<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px"> <el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px">
<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px"> <el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
<el-form-item label="区域编码" prop="code"> <el-form-item label="区域类别名称" prop="classname">
<el-input v-model="form.item.code" style="width:280px;" placeholder="请输入区域编码"/>
</el-form-item>
<el-form-item label="类别名称" prop="classname">
<el-input v-model="form.item.classname" style="width:280px;" placeholder="请输入类别名称"/> <el-input v-model="form.item.classname" style="width:280px;" placeholder="请输入类别名称"/>
</el-form-item> </el-form-item>
<el-form-item label="区域遮罩层颜色" prop="color"> <el-form-item label="区域遮罩层颜色" prop="color">
<el-input v-model="form.item.color" style="width:280px;" placeholder="请输入区域遮罩层颜色"/> <el-select v-model="form.item.color" placeholder="请选择区域遮罩层颜色" style="width:280px;">
<el-option label="蓝色" value="蓝色"></el-option>
<el-option label="绿色" value="绿色"></el-option>
<el-option label="红色" value="红色"></el-option>
<el-option label="黄色" value="黄色"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -81,7 +82,6 @@ export default { ...@@ -81,7 +82,6 @@ export default {
} }
}, },
mounted() { mounted() {
var that = this;
this.$nextTick(() => { this.$nextTick(() => {
this.loadData(); this.loadData();
}) })
......
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