Skip to content

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

修改

parent 378677db
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 479 additions and 145 deletions
src/assets/js/common.js
View file @ a4cbe12c
...@@ -378,6 +378,147 @@ var HttpReq = function(){ ...@@ -378,6 +378,147 @@ var HttpReq = function(){
data:data, data:data,
}) })
}, },
//区域管理——区域信息设置——品位设置
RegionalInformationGradeQuery: function(param){
return request({
url: '/api/AreaTaste',
method: 'get',
params:param,
})
},
RegionalInformationGradeAdd: function(data){
return request({
url: '/api/AreaTaste',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
RegionalInformationGradeUpdate: function(data){
return request({
url: '/api/AreaTaste',
method: 'PUT',
data:data,
})
},
RegionalInformationGradeDel: function(data){
return request({
url: '/api/AreaTaste',
method: 'Delete',
data:data,
})
},
//视频监控——矿山监控管理——分区管理
mineMonitoringPartitionQuery: function(param){
return request({
url: '/camera/list',
method: 'get',
params:param,
})
},
mineMonitoringPartitionAdd: function(data){
return request({
url: '/camera/addCamera',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
mineMonitoringPartitionUpdate: function(data){
return request({
url: '/camera/updateCamera',
method: 'PUT',
data:data,
})
},
mineMonitoringPartitionDel: function(data){
return request({
url: '/camera/delCamera',
method: 'Delete',
data:data,
})
},
//视频监控——矿山监控管理——摄像头详细管理
mineMonitoringCameraQuery: function(param){
return request({
url: '/cameraDetail/list',
method: 'get',
params:param,
})
},
mineMonitoringCameraAdd: function(data){
return request({
url: '/cameraDetail/addCameraDetail',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
mineMonitoringCameraDel: function(data){
return request({
url: '/cameraDetail/delCameraDetail',
method: 'Delete',
data:data,
})
},
//视频监控——车辆监控管理——车队管理
carMonitoringFleetQuery: function(param){
return request({
url: '/Car/list',
method: 'get',
params:param,
})
},
carMonitoringFleetAdd: function(data){
return request({
url: '/Car/addCamera',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
carMonitoringFleetUpdate: function(data){
return request({
url: '/Car/updateCamera',
method: 'PUT',
data:data,
})
},
carMonitoringFleetDel: function(data){
return request({
url: '/Car/delCamera',
method: 'Delete',
data:data,
})
},
//视频监控——车辆监控管理——车辆详细管理
carMonitoringCarsQuery: function(param){
return request({
url: '/api/CarCamera',
method: 'get',
params:param,
})
},
carMonitoringCarsAdd: function(data){
return request({
url: '/api/CarCamera',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
carMonitoringCarsDel: function(data){
return request({
url: '/api/CarCamera',
method: 'Delete',
data:data,
})
},
......
src/views/monitoringManagement/mineVideoSetUp/index.vue
View file @ a4cbe12c
...@@ -97,8 +97,7 @@ ...@@ -97,8 +97,7 @@
</template> </template>
<script> <script>
// import { httpGet,httpPostForJson,httpDelForJson,putForJson } from "@/common/httpBean.js" import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
// import {mainCamera,delCamera,addCamera,updateCamera,mainCameraDetail,addCameraDetail,delCameraDetail} from "@/axios/api.js"
export default { export default {
created(){ created(){
this.getCode() this.getCode()
...@@ -142,32 +141,31 @@ export default { ...@@ -142,32 +141,31 @@ export default {
this.getCode1(row.id); this.getCode1(row.id);
}, },
formatter(row, column) { formatter(row, column) {
return row.brand === 1? "海康威视" : "大华"; return row.brand === 1? "海康威视" : "大华";
}, },
getCode() { getCode() {
httpGet(mainCamera).then(res => { let param = {};
this.main_camera = res.content; HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
this.main_camera = res.content;
if(res.content.length > 0){ if(res.content.length > 0){
this.DetailTitle = res.content[0].name; this.DetailTitle = res.content[0].name;
this.getCode1(res.content[0].id); this.getCode1(res.content[0].id);
} }
}); })
}, },
getCode1(id) { getCode1(id) {
let that = this; HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:id}).then((res) => {
httpGet(mainCameraDetail,{page:0,size:100,cameraId:id}).then(res => {
console.log("mainCameraDetail",res); console.log("mainCameraDetail",res);
this.cameraDetail = res.content this.cameraDetail = res.content
}); })
}, },
//分区部分 //分区部分
zonechecked(row){ zonechecked(row){
//console.log(row);
this.cameraDetailName = row.name + "分区详情表"; this.cameraDetailName = row.name + "分区详情表";
httpGet(mainCameraDetail,{page:0,size:100,cameraId:row.id}).then(res => { HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:id}).then((res) => {
console.log("mainCameraDetail",res); console.log("mainCameraDetail",res);
this.cameraDetail = res.content this.cameraDetail = res.content
}); })
}, },
zoneEdit(type,row){ zoneEdit(type,row){
this.zoneData = {}; this.zoneData = {};
...@@ -185,24 +183,26 @@ export default { ...@@ -185,24 +183,26 @@ export default {
if (valid) { if (valid) {
if(this.zoneType == "add"){ if(this.zoneType == "add"){
console.log(this.zoneData); console.log(this.zoneData);
httpPostForJson(addCamera,this.zoneData).then(res => { let param = {};
HttpReq.truckDispatching.mineMonitoringPartitionAdd(this.zoneData).then((res) => {
this.$message.success('添加成功'); this.$message.success('添加成功');
httpGet(mainCamera).then(res => { HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
this.main_camera = res.content; this.main_camera = res.content;
console.log("mainCamera",this.main_camera); console.log("mainCamera",this.main_camera);
}); })
}); }).catch(function(error) { });
this.zoneVisible = false; this.zoneVisible = false;
this.zoneData = {name: ''}; this.zoneData = {name: ''};
}else if(this.zoneType == "change"){ }else if(this.zoneType == "change"){
console.log(this.zoneData); console.log(this.zoneData);
putForJson(updateCamera,this.zoneData).then(res => { let param = {};
HttpReq.truckDispatching.mineMonitoringPartitionUpdate(this.zoneData).then((res) => {
this.$message.success('修改成功'); this.$message.success('修改成功');
httpGet(mainCamera).then(res => { HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
this.main_camera = res.content; this.main_camera = res.content;
console.log("mainCamera",this.main_camera); console.log("mainCamera",this.main_camera);
}); })
}); }).catch(function(error) { });
this.zoneVisible = false; this.zoneVisible = false;
this.zoneData = {id:'',name: ''}; this.zoneData = {id:'',name: ''};
} }
...@@ -222,15 +222,16 @@ export default { ...@@ -222,15 +222,16 @@ export default {
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
type: 'warning' type: 'warning'
}).then( () => { }).then( () => {
httpDelForJson(delCamera,[row.id]).then( res => { HttpReq.truckDispatching.mineMonitoringPartitionDel([row.id]).then((res) => {
this.$message({ this.$message({
message: "删除成功", message: "删除成功",
type: 'success' type: 'success'
}); });
httpGet(mainCamera).then(res => { let param = {};
HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
this.main_camera = res.content; this.main_camera = res.content;
console.log("mainCamera",this.main_camera); console.log("mainCamera",this.main_camera);
}); })
}) })
}) })
}, },
...@@ -239,13 +240,14 @@ export default { ...@@ -239,13 +240,14 @@ export default {
let arrs = []; let arrs = [];
arrs.push(parseInt(that.zoneData.id)); arrs.push(parseInt(that.zoneData.id));
console.log(arrs); console.log(arrs);
httpDelForJson(delCamera,arrs).then(res => { HttpReq.truckDispatching.mineMonitoringPartitionDel(arrs).then((res) => {
this.$message.success('删除成功'); this.$message.success('删除成功');
httpGet(mainCamera).then(res => { let param = {};
HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
this.main_camera = res.content; this.main_camera = res.content;
console.log("mainCamera",this.main_camera); console.log("mainCamera",this.main_camera);
}); })
}); })
this.zoneDeleteVisible = false; this.zoneDeleteVisible = false;
}, },
cancelDeleteZone(){ cancelDeleteZone(){
...@@ -272,13 +274,13 @@ export default { ...@@ -272,13 +274,13 @@ export default {
if(this.cameraDetailType == "add"){ if(this.cameraDetailType == "add"){
this.cameraDetailData.cameraId = this.camID; this.cameraDetailData.cameraId = this.camID;
console.log(this.cameraDetailData); console.log(this.cameraDetailData);
httpPostForJson(addCameraDetail,this.cameraDetailData).then(res => { HttpReq.truckDispatching.mineMonitoringCameraAdd(this.cameraDetailData).then((res) => {
this.$message.success('添加成功'); this.$message.success('添加成功');
httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => { HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:this.camID}).then((res) => {
console.log("mainCameraDetail",res); console.log("mainCameraDetail",res);
this.cameraDetail = res.content this.cameraDetail = res.content
}); })
}); }).catch(function(error) { });
this.cameraDetailVisible = false; this.cameraDetailVisible = false;
this.cameraDetailData = {}; this.cameraDetailData = {};
}else if(this.cameraDetailType == "change"){ }else if(this.cameraDetailType == "change"){
...@@ -310,15 +312,15 @@ export default { ...@@ -310,15 +312,15 @@ export default {
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', { this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
type: 'warning' type: 'warning'
}).then( () => { }).then( () => {
httpDelForJson(delCameraDetail,[row.id]).then( res => { HttpReq.truckDispatching.mineMonitoringCameraDel([row.id]).then((res) => {
this.$message({ this.$message({
message: "删除成功", message: "删除成功",
type: 'success' type: 'success'
}); });
httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => { HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:this.camID}).then((res) => {
console.log("mainCameraDetail",res); console.log("mainCameraDetail",res);
this.cameraDetail = res.content this.cameraDetail = res.content
}); })
}) })
}) })
}, },
...@@ -327,13 +329,13 @@ export default { ...@@ -327,13 +329,13 @@ export default {
let arrs1 = []; let arrs1 = [];
arrs1.push(parseInt(that.cameraDetailData.id)); arrs1.push(parseInt(that.cameraDetailData.id));
console.log(arrs1); console.log(arrs1);
httpDelForJson(delCameraDetail,arrs1).then(res => { HttpReq.truckDispatching.mineMonitoringCameraDel(arrs1).then((res) => {
this.$message.success('删除成功'); this.$message.success('删除成功');
httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => { HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:this.camID}).then((res) => {
console.log("mainCameraDetail",res); console.log("mainCameraDetail",res);
this.cameraDetail = res.content this.cameraDetail = res.content
}); })
}); })
this.cameraDetaileDeleteVisible = false; this.cameraDetaileDeleteVisible = false;
this.cameraDetailData = {}; this.cameraDetailData = {};
}, },
...@@ -380,27 +382,22 @@ export default { ...@@ -380,27 +382,22 @@ export default {
height: 49.8%; height: 49.8%;
border: 1px solid red; border: 1px solid red;
} }
</style> .text {
<style> font-size: 14px;
.text { }
font-size: 14px; .item {
} margin-bottom: 18px;
}
.item { .clearfix:before,
margin-bottom: 18px; .clearfix:after {
} display: table;
content: "";
.clearfix:before, }
.clearfix:after { .clearfix:after {
display: table; clear: both
content: ""; }
} .box-card {
.clearfix:after { width: 380px;
clear: both height: 100%;
} }
.box-card {
width: 380px;
height: 100%;
}
</style> </style>
\ No newline at end of file
src/views/regionalManagement/regionalInformation/index.vue
View file @ a4cbe12c
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<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>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="toDelete(scope.row)"></el-button> <el-button size="mini" type="danger" icon="el-icon-delete" @click="toDelete(scope.row)"></el-button>
<el-button size="mini" type="success" icon="el-icon-view" v-show="scope.row.areaore == '是'"></el-button> <el-button size="mini" type="success" icon="el-icon-view" v-show="scope.row.areaore == '是'" @click="showGradeTable(scope.row)"></el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -132,6 +132,42 @@ ...@@ -132,6 +132,42 @@
</el-dialog> </el-dialog>
<!-- 品位设置 -->
<el-dialog title="品位设置" :visible.sync="dialogTableVisible">
<div class="toolbar" style="margin-bottom:15px;">
<el-button size="mini" type="primary" icon="el-icon-plus" @click="gradeToAdd">新增</el-button>
</div>
<el-table :data="gridData" border v-loading="gradeLoading">
<el-table-column property="name" label="品位名称" align="center"></el-table-column>
<el-table-column property="content" label="含量" align="center"></el-table-column>
<el-table-column property="unit" label="单位" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="gradeToEdit(scope.row)"></el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="gradeToDelete(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 品位设置表单 -->
<el-dialog :title="gradeFrom.title" :before-close="gradeCancelForm" :visible.sync="gradeFrom.visible" width="700px">
<el-form :model="gradeFrom.item" :inline="true" ref="form2" size="small" label-width="150px">
<el-form-item label="品位名称">
<el-input v-model="gradeFrom.item.name" style="width:260px;" placeholder="请输入品位名称"></el-input>
</el-form-item>
<el-form-item label="含量">
<el-input v-model="gradeFrom.item.content" style="width:260px;" placeholder="请输入含量"></el-input>
</el-form-item>
<el-form-item label="单位">
<el-input v-model="gradeFrom.item.unit" style="width:260px;" placeholder="请输入单位"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="gradeCancelForm">取 消</el-button>
<el-button :loading="gradeFrom.status.cu === 2" type="primary" @click="gradeSubmitForm('form2', gradeFrom.item)">确 定</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -170,6 +206,20 @@ export default { ...@@ -170,6 +206,20 @@ export default {
// {required: true, message: '请输入区域信息', trigger: 'blur' } // {required: true, message: '请输入区域信息', trigger: 'blur' }
// ], // ],
}, },
//品味设置数据
dialogTableVisible: false,
gridData: [],
gradeLoading: false,
gradeQueryId:0,
gradeFrom:{
title:'新增品位',
visible:false,
reqType:'add',
status:{cu:0},
item:{},
}
} }
}, },
mounted() { mounted() {
...@@ -179,6 +229,7 @@ export default { ...@@ -179,6 +229,7 @@ export default {
}) })
}, },
methods: { methods: {
//获取区域信息数据
loadData() { loadData() {
var sort = 'createTime,desc'; var sort = 'createTime,desc';
var param = this.query; var param = this.query;
...@@ -383,6 +434,145 @@ export default { ...@@ -383,6 +434,145 @@ export default {
console.log(error); console.log(error);
}); });
}, },
//品味设置方法
showGradeTable(row){
this.dialogTableVisible = true;
this.gradeQueryId = row.id;
this.loadGradeData();
},
//获取品味设置数据
loadGradeData(){
var sort = 'id,desc';
var param = {};
param.sort = sort;
param.areaId = this.gradeQueryId;
this.$nextTick(()=>{
HttpReq.truckDispatching.RegionalInformationGradeQuery(param).then((res) => {
if(res.code == 200){
this.gradeLoading = false;
this.gridData = res.data.content;
}
})
})
},
gradeCancelForm(a, b, c){
this.gradeFrom.visible = false;
},
gradeSubmitForm(validateName, item){
if(!this.gradeFrom.status.cu){
this.gradeFrom.status.cu = 2;
this.$refs[validateName].validate(valid => {
if(valid){
if(this.gradeFrom.reqType === 'add'){
this.gradeReqAddItem(this.gradeFrom, item)
}else{
this.gradeReqUpdateItem(this.gradeFrom, item)
}
}else{
this.gradeFrom.status.cu = 0
}
});
};
},
gradeToAdd() {
// 请除表单验证
this.$refs['form2'] && this.$refs['form2'].clearValidate();
this.gradeFrom.title = '新增品味';
this.gradeFrom.status.cu = 0;
this.gradeFrom.visible = true;
this.gradeFrom.reqType = 'add';
this.gradeFrom.item = {};
},
gradeToEdit(item) {
// 请除表单验证
this.$refs['form2'] && this.$refs['form2'].clearValidate();
this.gradeFrom.title = '修改品位设置';
this.gradeFrom.status.cu = 0;
this.gradeFrom.visible = true;
this.gradeFrom.item = {...item};
this.gradeFrom.reqType = 'edit';
},
gradeToDelete(item) {
var id = item.id;
this.$confirm('确认删除该条数据吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then((e) => {
this.gradeReqRemoveProject([id])
}).catch((e) => {})
},
//新增品味设置
gradeReqAddItem(gradeFrom, item){
let lastData = {...item};
lastData.areaId = this.gradeQueryId;
HttpReq.truckDispatching.RegionalInformationGradeAdd(lastData).then((res) => {
gradeFrom.visible = false;
if(res.code == 200){
this.$notify({
title: '品味设置新增成功！',
type: 'success',
duration: 2500
});
this.loadGradeData()
}else{
this.$notify({
title: res.msg,
type: 'error',
duration: 2500
})
}
}).catch(function(error) {
gradeFrom.status.cu = 0
});
},
//修改品味设置
gradeReqUpdateItem(gradeFrom, item){
let lastData = {...item};
HttpReq.truckDispatching.RegionalInformationGradeUpdate(lastData).then((res) => {
gradeFrom.visible = false;
if(res.code == 200){
this.$notify({
title: '品味设置修改成功！',
type: 'success',
duration: 2500
});
this.loadGradeData()
}else{
this.$notify({
title: res.msg,
type: 'error',
duration: 2500
})
this.loadGradeData()
}
}).catch(function(error) {
gradeFrom.status.cu = 0
});
},
//删除品味设置
gradeReqRemoveProject(item){
HttpReq.truckDispatching.RegionalInformationGradeDel(item).then((res) => {
if(res.status == 400){
this.$notify({
title: res.msg,
type: 'error',
duration: 2500
})
}else{
this.$notify({
title: '删除成功！',
type: 'success',
duration: 2500
});
}
this.loadGradeData();
})
},
} }
} }
</script> </script>
......
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